diff --git a/build/demo/kitchen-sink/mode-xquery-uncompressed.js b/build/demo/kitchen-sink/mode-xquery-uncompressed.js
index 39917c8e..502fbcd8 100644
--- a/build/demo/kitchen-sink/mode-xquery-uncompressed.js
+++ b/build/demo/kitchen-sink/mode-xquery-uncompressed.js
@@ -35,18 +35,19 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/xquery_tokenizer', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
+define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
 "use strict";
 
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var XQueryTokenizer = require("./xquery_tokenizer").XQueryTokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new XQueryTokenizer();
+    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -116,11 +117,22 @@ oop.inherits(Mode, TextMode);
         }
     };
     
+    this.deltas = [];
+
     this.createWorker = function(session) {
         var worker = new WorkerClient(["ace"], "worker-xquery.js", "ace/mode/xquery_worker", "XQueryWorker");
-        var self = this;
+        var that = this;
+
+        session.getDocument().on('change', function(evt){
+          that.deltas.push(evt.data);
+        });
+        
         worker.attachToDocument(session.getDocument());
         
+        worker.on("start", function(e) {
+          that.deltas = [];
+        });
+
         worker.on("error", function(e) {
           session.setAnnotations([e.data]);
         });
@@ -130,15 +142,47 @@ oop.inherits(Mode, TextMode);
         });
         
         worker.on("highlight", function(tokens) {
-          self.$tokenizer.cache = tokens.data;
           var firstRow = 0;
           var lastRow = session.getLength() - 1;
-          var currentLineIndex = session.bgTokenizer.currentLine;
-          var currentLine = session.bgTokenizer.lines[currentLineIndex];
-          session.bgTokenizer.lines = [];
-          session.bgTokenizer.lines[currentLineIndex] = currentLine;
+          
+          var lines = tokens.data;
+          
+          for(var i in that.deltas)
+          {
+            var delta = that.deltas[i];
+            if (delta.action === "insertLines")
+            {
+              var newLineCount = delta.range.end.row - delta.range.start.row;
+              this.$insertNewRows(delta.range.start.row, newLineCount);
+              for (var i = 0; i < newLineCount; i++) {
+                lines.splice(delta.range.start.row + i, 0, undefined);
+              }
+            }
+            else if (delta.action === "insertText")
+            {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0, undefined);
+              } else {
+                delete lines[delta.range.start.row];
+              } 
+            } else if (delta.action === "removeLines") {
+              var oldLineCount = delta.range.end.row - delta.range.start.row;
+              lines.splice(delta.range.start.row, oldLineCount);
+            } else if (delta.action === "removeText") {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0);
+              } else {
+                delete lines[delta.range.start.row];
+              }
+            }           
+          }
+          
+          session.bgTokenizer.lines = lines;
           session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
         });
+        
         return worker;
     };
     
@@ -312,68 +356,6 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
 exports.WorkerClient = WorkerClient;
 
 });
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define('ace/mode/xquery_tokenizer', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/xquery_highlight_rules'], function(require, exports, module) {
-"use strict";
-  
-  var Tokenizer = require("../tokenizer").Tokenizer;
-  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-
-  var XQueryTokenizer = exports.XQueryTokenizer = function(){
-    this.cache = [];
-    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-  };
-
-  (function() {
-    this.getLineTokens = function(line, startState) {
-      var cachedLine = null;
-      for(var i in this.cache)
-      {
-        var c = this.cache[i];
-        if(c && c.line == line && c.startState == startState) {
-          return c.tokens;
-        }
-      }
-      return this.$regexpTokenizer.getLineTokens(line, startState);
-    };
-  }).call(XQueryTokenizer.prototype);
-}); 
 /*
  *  eXide - web-based XQuery IDE
  *  
diff --git a/build/demo/kitchen-sink/worker-xquery.js b/build/demo/kitchen-sink/worker-xquery.js
index 9670498e..bfd38baf 100644
--- a/build/demo/kitchen-sink/worker-xquery.js
+++ b/build/demo/kitchen-sink/worker-xquery.js
@@ -1560,6 +1560,7 @@ oop.inherits(XQueryWorker, Mirror);
 (function() {
     
   this.onUpdate = function() {
+    this.sender.emit("start");
     var value = this.doc.getValue();    
     var parser = xquery.getParser(value);
     var ast = parser.p_Module();
@@ -8950,7 +8951,7 @@ exports.org = org;
 
 });
 define('ace/mode/xquery/XQueryLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-20 08:26:27
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-23 09:26:57
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -19381,7 +19382,7 @@ org.antlr.lang.extend(XQDTLexer, org.antlr.runtime.Lexer, {
 
 });
 define('ace/mode/xquery/XQueryParser', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/StringLexer', 'ace/mode/xquery/XMLLexer', 'ace/mode/xquery/XQueryLexer', 'ace/mode/xquery/XQDTParser', 'ace/mode/xquery/Position'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-20 08:26:36
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-23 09:27:07
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -19441,6 +19442,8 @@ var XQueryParser = function(input, state) {
     (function(){
 
 
+        this.isInAttr = false;
+
         this.errors = [];
 
         this.hasErrors = function(){
@@ -20309,7 +20312,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:293:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
+    // xquery/XQueryParser.g:295:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
     // $ANTLR start "p_Module"
     p_Module: function() {
         var retval = new XQueryParser.p_Module_return();
@@ -20328,14 +20331,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_LibraryModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_LibraryModule");
         var stream_p_MainModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_MainModule");
         try {
-            // xquery/XQueryParser.g:294:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
-            // xquery/XQueryParser.g:294:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
-            // xquery/XQueryParser.g:294:13: (vd= p_VersionDecl )?
+            // xquery/XQueryParser.g:296:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
+            // xquery/XQueryParser.g:296:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
+            // xquery/XQueryParser.g:296:13: (vd= p_VersionDecl )?
             var alt1=2;
             alt1 = this.dfa1.predict(this.input);
             switch (alt1) {
                 case 1 :
-                    // xquery/XQueryParser.g:294:13: vd= p_VersionDecl
+                    // xquery/XQueryParser.g:296:13: vd= p_VersionDecl
                     this.pushFollow(XQueryParser.FOLLOW_p_VersionDecl_in_p_Module507);
                     vd=this.p_VersionDecl();
 
@@ -20348,12 +20351,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
+            // xquery/XQueryParser.g:297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
             var alt2=2;
             alt2 = this.dfa2.predict(this.input);
             switch (alt2) {
                 case 1 :
-                    // xquery/XQueryParser.g:296:15: lm= p_LibraryModule[$vd.tree]
+                    // xquery/XQueryParser.g:298:15: lm= p_LibraryModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_LibraryModule_in_p_Module540);
                     lm=this.p_LibraryModule((vd?vd.tree:null));
 
@@ -20373,7 +20376,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 296:44: ->
+                    // 298:44: ->
                     {
                         this.adaptor.addChild(root_0, (lm?lm.tree:null));
 
@@ -20383,7 +20386,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:297:15: mm= p_MainModule[$vd.tree]
+                    // xquery/XQueryParser.g:299:15: mm= p_MainModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_MainModule_in_p_Module563);
                     mm=this.p_MainModule((vd?vd.tree:null));
 
@@ -20403,7 +20406,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 297:44: ->
+                    // 299:44: ->
                     {
                         this.adaptor.addChild(root_0, (mm?mm.tree:null));
 
@@ -20454,7 +20457,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:302:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
+    // xquery/XQueryParser.g:304:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
     // $ANTLR start "p_VersionDecl"
     p_VersionDecl: function() {
         var retval = new XQueryParser.p_VersionDecl_return();
@@ -20475,15 +20478,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_XQUERY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token XQUERY");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:303:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
-            // xquery/XQueryParser.g:303:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:305:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
+            // xquery/XQueryParser.g:305:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
             k=this.match(this.input,XQUERY,XQueryParser.FOLLOW_XQUERY_in_p_VersionDecl615); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_XQUERY.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:303:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
+            // xquery/XQueryParser.g:305:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
             var alt4=2;
             var LA4_0 = this.input.LA(1);
 
@@ -20502,9 +20505,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt4) {
                 case 1 :
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:37: k= ENCODING enc= p_StringLiteral
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:37: k= ENCODING enc= p_StringLiteral
                     k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl623); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -20524,9 +20527,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
                     k=this.match(this.input,VERSION,XQueryParser.FOLLOW_VERSION_in_p_VersionDecl650); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_VERSION.add(k);
 
@@ -20539,7 +20542,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(ver.getTree());
-                    // xquery/XQueryParser.g:304:59: (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:59: (k= ENCODING enc= p_StringLiteral )?
                     var alt3=2;
                     var LA3_0 = this.input.LA(1);
 
@@ -20548,7 +20551,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt3) {
                         case 1 :
-                            // xquery/XQueryParser.g:304:60: k= ENCODING enc= p_StringLiteral
+                            // xquery/XQueryParser.g:306:60: k= ENCODING enc= p_StringLiteral
                             k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl661); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -20582,7 +20585,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: enc, ver
+            // elements: ver, enc
             // token labels: 
             // rule labels: retval, ver, enc
             // token list labels: 
@@ -20594,19 +20597,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_enc=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token enc",enc!=null?enc.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 305:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+            // 307:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
             {
-                // xquery/XQueryParser.g:305:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+                // xquery/XQueryParser.g:307:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VersionDecl, "VersionDecl"), root_1);
 
-                // xquery/XQueryParser.g:305:34: ^( VersionDeclVersion ( $ver)? )
+                // xquery/XQueryParser.g:307:34: ^( VersionDeclVersion ( $ver)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclVersion, "VersionDeclVersion"), root_2);
 
-                // xquery/XQueryParser.g:305:55: ( $ver)?
+                // xquery/XQueryParser.g:307:55: ( $ver)?
                 if ( stream_ver.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ver.nextTree());
 
@@ -20615,12 +20618,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:305:62: ^( VersionDeclEncoding ( $enc)? )
+                // xquery/XQueryParser.g:307:62: ^( VersionDeclEncoding ( $enc)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclEncoding, "VersionDeclEncoding"), root_2);
 
-                // xquery/XQueryParser.g:305:84: ( $enc)?
+                // xquery/XQueryParser.g:307:84: ( $enc)?
                 if ( stream_enc.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_enc.nextTree());
 
@@ -20671,7 +20674,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:309:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
+    // xquery/XQueryParser.g:311:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
     // $ANTLR start "p_MainModule"
     p_MainModule: function(vd) {
         var retval = new XQueryParser.p_MainModule_return();
@@ -20685,8 +20688,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_QueryBody=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_QueryBody");
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         try {
-            // xquery/XQueryParser.g:310:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
-            // xquery/XQueryParser.g:310:11: pm_Prolog pm_QueryBody
+            // xquery/XQueryParser.g:312:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
+            // xquery/XQueryParser.g:312:11: pm_Prolog pm_QueryBody
             this.pushFollow(XQueryParser.FOLLOW_pm_Prolog_in_p_MainModule739);
             pm_Prolog3=this.pm_Prolog();
 
@@ -20712,9 +20715,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 311:17: -> ^( MainModule pm_Prolog )
+            // 313:17: -> ^( MainModule pm_Prolog )
             {
-                // xquery/XQueryParser.g:311:20: ^( MainModule pm_Prolog )
+                // xquery/XQueryParser.g:313:20: ^( MainModule pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(MainModule, "MainModule"), root_1);
@@ -20763,7 +20766,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:315:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
+    // xquery/XQueryParser.g:317:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
     // $ANTLR start "p_LibraryModule"
     p_LibraryModule: function(vd) {
         var retval = new XQueryParser.p_LibraryModule_return();
@@ -20777,8 +20780,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         var stream_p_ModuleDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ModuleDecl");
         try {
-            // xquery/XQueryParser.g:316:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
-            // xquery/XQueryParser.g:316:11: p_ModuleDecl pm_Prolog
+            // xquery/XQueryParser.g:318:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
+            // xquery/XQueryParser.g:318:11: p_ModuleDecl pm_Prolog
             this.pushFollow(XQueryParser.FOLLOW_p_ModuleDecl_in_p_LibraryModule797);
             p_ModuleDecl5=this.p_ModuleDecl();
 
@@ -20794,7 +20797,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_ModuleDecl, pm_Prolog
+            // elements: pm_Prolog, p_ModuleDecl
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -20804,9 +20807,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 317:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
+            // 319:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
             {
-                // xquery/XQueryParser.g:317:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
+                // xquery/XQueryParser.g:319:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(LibraryModule, "LibraryModule"), root_1);
@@ -20856,7 +20859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:321:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
+    // xquery/XQueryParser.g:323:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
     // $ANTLR start "p_ModuleDecl"
     p_ModuleDecl: function() {
         var retval = new XQueryParser.p_ModuleDecl_return();
@@ -20881,8 +20884,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:322:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
-            // xquery/XQueryParser.g:322:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:324:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
+            // xquery/XQueryParser.g:324:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
             k=this.match(this.input,MODULE,XQueryParser.FOLLOW_MODULE_in_p_ModuleDecl855); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_MODULE.add(k);
 
@@ -20929,9 +20932,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 323:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
+            // 325:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
             {
-                // xquery/XQueryParser.g:323:21: ^( ModuleDecl p_NCName p_StringLiteral )
+                // xquery/XQueryParser.g:325:21: ^( ModuleDecl p_NCName p_StringLiteral )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleDecl, "ModuleDecl"), root_1);
@@ -20980,7 +20983,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:329:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
+    // xquery/XQueryParser.g:331:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
     // $ANTLR start "pm_Prolog"
     pm_Prolog: function() {
         var retval = new XQueryParser.pm_Prolog_return();
@@ -21007,17 +21010,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_OrderedDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_OrderedDecl");
         var stream_pm_FTOptionDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_FTOptionDecl");
         try {
-            // xquery/XQueryParser.g:330:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
+            // xquery/XQueryParser.g:332:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
             loop6:
             do {
                 var alt6=2;
                 alt6 = this.dfa6.predict(this.input);
                 switch (alt6) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
                     var alt5=5;
                     var LA5_0 = this.input.LA(1);
 
@@ -21073,7 +21076,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt5) {
                         case 1 :
-                            // xquery/XQueryParser.g:330:13: dnd+= pm_DefaultNamespaceDecl
+                            // xquery/XQueryParser.g:332:13: dnd+= pm_DefaultNamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_DefaultNamespaceDecl_in_pm_Prolog928);
                             dnd=this.pm_DefaultNamespaceDecl();
 
@@ -21087,7 +21090,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:330:44: s+= p_Setter
+                            // xquery/XQueryParser.g:332:44: s+= p_Setter
                             this.pushFollow(XQueryParser.FOLLOW_p_Setter_in_pm_Prolog934);
                             s=this.p_Setter();
 
@@ -21101,7 +21104,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:330:58: nd+= pm_NamespaceDecl
+                            // xquery/XQueryParser.g:332:58: nd+= pm_NamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_NamespaceDecl_in_pm_Prolog940);
                             nd=this.pm_NamespaceDecl();
 
@@ -21115,7 +21118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 4 :
-                            // xquery/XQueryParser.g:330:81: i+= p_Import
+                            // xquery/XQueryParser.g:332:81: i+= p_Import
                             this.pushFollow(XQueryParser.FOLLOW_p_Import_in_pm_Prolog946);
                             i=this.p_Import();
 
@@ -21129,7 +21132,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 5 :
-                            // xquery/XQueryParser.g:330:95: fto+= pm_FTOptionDecl
+                            // xquery/XQueryParser.g:332:95: fto+= pm_FTOptionDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_FTOptionDecl_in_pm_Prolog952);
                             fto=this.pm_FTOptionDecl();
 
@@ -21154,7 +21157,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:330:121: (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:121: (od+= pg_OrderedDecl )*
             loop7:
             do {
                 var alt7=2;
@@ -21173,7 +21176,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt7) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:121: od+= pg_OrderedDecl
+                    // xquery/XQueryParser.g:332:121: od+= pg_OrderedDecl
                     this.pushFollow(XQueryParser.FOLLOW_pg_OrderedDecl_in_pm_Prolog959);
                     od=this.pg_OrderedDecl();
 
@@ -21195,7 +21198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nd, i, s, od, fto, dnd
+            // elements: s, nd, dnd, fto, od, i
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -21210,19 +21213,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_dnd=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token dnd",list_dnd);
             var stream_i=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token i",list_i);
             root_0 = this.adaptor.nil();
-            // 331:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+            // 333:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
             {
-                // xquery/XQueryParser.g:331:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+                // xquery/XQueryParser.g:333:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Prolog, "Prolog"), root_1);
 
-                // xquery/XQueryParser.g:332:33: ^( DefaultNamespaceDecls ( $dnd)* )
+                // xquery/XQueryParser.g:334:33: ^( DefaultNamespaceDecls ( $dnd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DefaultNamespaceDecls, "DefaultNamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:332:57: ( $dnd)*
+                // xquery/XQueryParser.g:334:57: ( $dnd)*
                 while ( stream_dnd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_dnd.nextTree());
 
@@ -21231,12 +21234,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:333:33: ^( Setters ( $s)* )
+                // xquery/XQueryParser.g:335:33: ^( Setters ( $s)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Setters, "Setters"), root_2);
 
-                // xquery/XQueryParser.g:333:43: ( $s)*
+                // xquery/XQueryParser.g:335:43: ( $s)*
                 while ( stream_s.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_s.nextTree());
 
@@ -21245,12 +21248,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:334:33: ^( NamespaceDecls ( $nd)* )
+                // xquery/XQueryParser.g:336:33: ^( NamespaceDecls ( $nd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecls, "NamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:334:50: ( $nd)*
+                // xquery/XQueryParser.g:336:50: ( $nd)*
                 while ( stream_nd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nd.nextTree());
 
@@ -21259,12 +21262,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:335:33: ^( Imports ( $i)* )
+                // xquery/XQueryParser.g:337:33: ^( Imports ( $i)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Imports, "Imports"), root_2);
 
-                // xquery/XQueryParser.g:335:43: ( $i)*
+                // xquery/XQueryParser.g:337:43: ( $i)*
                 while ( stream_i.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_i.nextTree());
 
@@ -21273,12 +21276,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:336:33: ^( FTOptionDecls ( $fto)* )
+                // xquery/XQueryParser.g:338:33: ^( FTOptionDecls ( $fto)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(FTOptionDecls, "FTOptionDecls"), root_2);
 
-                // xquery/XQueryParser.g:336:49: ( $fto)*
+                // xquery/XQueryParser.g:338:49: ( $fto)*
                 while ( stream_fto.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_fto.nextTree());
 
@@ -21287,12 +21290,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:337:33: ^( OrderedDecls ( $od)* )
+                // xquery/XQueryParser.g:339:33: ^( OrderedDecls ( $od)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(OrderedDecls, "OrderedDecls"), root_2);
 
-                // xquery/XQueryParser.g:337:48: ( $od)*
+                // xquery/XQueryParser.g:339:48: ( $od)*
                 while ( stream_od.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_od.nextTree());
 
@@ -21343,7 +21346,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:345:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
+    // xquery/XQueryParser.g:347:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
     // $ANTLR start "pg_OrderedDecl"
     pg_OrderedDecl: function() {
         var retval = new XQueryParser.pg_OrderedDecl_return();
@@ -21357,7 +21360,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:346:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
+            // xquery/XQueryParser.g:348:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
             var alt8=3;
             var LA8_0 = this.input.LA(1);
 
@@ -21396,7 +21399,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt8) {
                 case 1 :
-                    // xquery/XQueryParser.g:346:11: pm_ContextItemDecl
+                    // xquery/XQueryParser.g:348:11: pm_ContextItemDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ContextItemDecl_in_pg_OrderedDecl1274);
@@ -21409,7 +21412,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:347:11: pm_AnnotatedDecl
+                    // xquery/XQueryParser.g:349:11: pm_AnnotatedDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_AnnotatedDecl_in_pg_OrderedDecl1286);
@@ -21422,7 +21425,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:348:11: pm_OptionDecl
+                    // xquery/XQueryParser.g:350:11: pm_OptionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OptionDecl_in_pg_OrderedDecl1298);
@@ -21469,7 +21472,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
+    // xquery/XQueryParser.g:358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
     // $ANTLR start "p_Setter"
     p_Setter: function() {
         var retval = new XQueryParser.p_Setter_return();
@@ -21489,12 +21492,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:357:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
+            // xquery/XQueryParser.g:359:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
             var alt9=9;
             alt9 = this.dfa9.predict(this.input);
             switch (alt9) {
                 case 1 :
-                    // xquery/XQueryParser.g:357:11: pm_BoundarySpaceDecl
+                    // xquery/XQueryParser.g:359:11: pm_BoundarySpaceDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BoundarySpaceDecl_in_p_Setter1328);
@@ -21507,7 +21510,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:358:11: pm_DefaultCollationDecl
+                    // xquery/XQueryParser.g:360:11: pm_DefaultCollationDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DefaultCollationDecl_in_p_Setter1340);
@@ -21520,7 +21523,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:359:11: pm_BaseURIDecl
+                    // xquery/XQueryParser.g:361:11: pm_BaseURIDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BaseURIDecl_in_p_Setter1352);
@@ -21533,7 +21536,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:360:11: pm_ConstructionDecl
+                    // xquery/XQueryParser.g:362:11: pm_ConstructionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ConstructionDecl_in_p_Setter1364);
@@ -21546,7 +21549,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:361:11: pm_OrderingModeDecl
+                    // xquery/XQueryParser.g:363:11: pm_OrderingModeDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OrderingModeDecl_in_p_Setter1376);
@@ -21559,7 +21562,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:362:11: pm_EmptyOrderDecl
+                    // xquery/XQueryParser.g:364:11: pm_EmptyOrderDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_EmptyOrderDecl_in_p_Setter1388);
@@ -21572,7 +21575,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:363:11: {...}? => pm_RevalidationDecl
+                    // xquery/XQueryParser.g:365:11: {...}? => pm_RevalidationDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
@@ -21589,7 +21592,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:364:11: pm_CopyNamespacesDecl
+                    // xquery/XQueryParser.g:366:11: pm_CopyNamespacesDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_CopyNamespacesDecl_in_p_Setter1415);
@@ -21602,7 +21605,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:365:11: pm_DecimalFormatDecl
+                    // xquery/XQueryParser.g:367:11: pm_DecimalFormatDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DecimalFormatDecl_in_p_Setter1427);
@@ -21649,7 +21652,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:369:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:371:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
     // $ANTLR start "pm_BoundarySpaceDecl"
     pm_BoundarySpaceDecl: function() {
         var retval = new XQueryParser.pm_BoundarySpaceDecl_return();
@@ -21664,8 +21667,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON23_tree=null;
 
         try {
-            // xquery/XQueryParser.g:370:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
-            // xquery/XQueryParser.g:370:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
+            // xquery/XQueryParser.g:372:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
+            // xquery/XQueryParser.g:372:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BoundarySpaceDecl1459); if (this.state.failed) return retval;
@@ -21684,7 +21687,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:370:68: ( (k= PRESERVE ) | (k= STRIP ) )
+            // xquery/XQueryParser.g:372:68: ( (k= PRESERVE ) | (k= STRIP ) )
             var alt10=2;
             var LA10_0 = this.input.LA(1);
 
@@ -21703,9 +21706,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt10) {
                 case 1 :
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:71: k= PRESERVE
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:71: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_BoundarySpaceDecl1474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -21721,9 +21724,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:101: k= STRIP
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:101: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_BoundarySpaceDecl1484); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -21782,7 +21785,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:374:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:376:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultCollationDecl"
     pm_DefaultCollationDecl: function() {
         var retval = new XQueryParser.pm_DefaultCollationDecl_return();
@@ -21798,8 +21801,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON25_tree=null;
 
         try {
-            // xquery/XQueryParser.g:375:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:375:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:377:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:377:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultCollationDecl1519); if (this.state.failed) return retval;
@@ -21873,7 +21876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:379:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
+    // xquery/XQueryParser.g:381:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
     // $ANTLR start "pm_BaseURIDecl"
     pm_BaseURIDecl: function() {
         var retval = new XQueryParser.pm_BaseURIDecl_return();
@@ -21892,8 +21895,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_BASE_URI=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BASE_URI");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:380:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
-            // xquery/XQueryParser.g:380:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:382:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
+            // xquery/XQueryParser.g:382:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BaseURIDecl1573); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -21929,9 +21932,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 381:17: -> ^( BaseURIDecl $sl)
+            // 383:17: -> ^( BaseURIDecl $sl)
             {
-                // xquery/XQueryParser.g:381:20: ^( BaseURIDecl $sl)
+                // xquery/XQueryParser.g:383:20: ^( BaseURIDecl $sl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(BaseURIDecl, "BaseURIDecl"), root_1);
@@ -21979,7 +21982,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:385:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:387:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
     // $ANTLR start "pm_ConstructionDecl"
     pm_ConstructionDecl: function() {
         var retval = new XQueryParser.pm_ConstructionDecl_return();
@@ -21994,8 +21997,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON27_tree=null;
 
         try {
-            // xquery/XQueryParser.g:386:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
-            // xquery/XQueryParser.g:386:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
+            // xquery/XQueryParser.g:388:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
+            // xquery/XQueryParser.g:388:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ConstructionDecl1640); if (this.state.failed) return retval;
@@ -22014,9 +22017,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:386:66: ( (k= STRIP | k= PRESERVE ) )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:66: ( (k= STRIP | k= PRESERVE ) )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
             var alt11=2;
             var LA11_0 = this.input.LA(1);
 
@@ -22035,7 +22038,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt11) {
                 case 1 :
-                    // xquery/XQueryParser.g:386:69: k= STRIP
+                    // xquery/XQueryParser.g:388:69: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_ConstructionDecl1655); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22045,7 +22048,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:386:79: k= PRESERVE
+                    // xquery/XQueryParser.g:388:79: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_ConstructionDecl1661); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22104,7 +22107,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:390:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:392:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
     // $ANTLR start "pm_OrderingModeDecl"
     pm_OrderingModeDecl: function() {
         var retval = new XQueryParser.pm_OrderingModeDecl_return();
@@ -22119,8 +22122,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON28_tree=null;
 
         try {
-            // xquery/XQueryParser.g:391:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
-            // xquery/XQueryParser.g:391:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
+            // xquery/XQueryParser.g:393:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
+            // xquery/XQueryParser.g:393:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OrderingModeDecl1696); if (this.state.failed) return retval;
@@ -22139,9 +22142,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:391:62: ( (k= ORDERED | k= UNORDERED ) )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:62: ( (k= ORDERED | k= UNORDERED ) )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
             var alt12=2;
             var LA12_0 = this.input.LA(1);
 
@@ -22160,7 +22163,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt12) {
                 case 1 :
-                    // xquery/XQueryParser.g:391:65: k= ORDERED
+                    // xquery/XQueryParser.g:393:65: k= ORDERED
                     k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_pm_OrderingModeDecl1711); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22170,7 +22173,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:391:77: k= UNORDERED
+                    // xquery/XQueryParser.g:393:77: k= UNORDERED
                     k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_pm_OrderingModeDecl1717); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22229,7 +22232,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:395:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:397:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
     // $ANTLR start "pm_EmptyOrderDecl"
     pm_EmptyOrderDecl: function() {
         var retval = new XQueryParser.pm_EmptyOrderDecl_return();
@@ -22244,8 +22247,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON29_tree=null;
 
         try {
-            // xquery/XQueryParser.g:396:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
-            // xquery/XQueryParser.g:396:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
+            // xquery/XQueryParser.g:398:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
+            // xquery/XQueryParser.g:398:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_EmptyOrderDecl1752); if (this.state.failed) return retval;
@@ -22280,9 +22283,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:396:107: ( (k= GREATEST | k= LEAST ) )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:107: ( (k= GREATEST | k= LEAST ) )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
             var alt13=2;
             var LA13_0 = this.input.LA(1);
 
@@ -22301,7 +22304,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt13) {
                 case 1 :
-                    // xquery/XQueryParser.g:396:110: k= GREATEST
+                    // xquery/XQueryParser.g:398:110: k= GREATEST
                     k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_pm_EmptyOrderDecl1779); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22311,7 +22314,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:396:123: k= LEAST
+                    // xquery/XQueryParser.g:398:123: k= LEAST
                     k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_pm_EmptyOrderDecl1785); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22370,7 +22373,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:400:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
+    // xquery/XQueryParser.g:402:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
     // $ANTLR start "pm_CopyNamespacesDecl"
     pm_CopyNamespacesDecl: function() {
         var retval = new XQueryParser.pm_CopyNamespacesDecl_return();
@@ -22389,8 +22392,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON33_tree=null;
 
         try {
-            // xquery/XQueryParser.g:401:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
-            // xquery/XQueryParser.g:401:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
+            // xquery/XQueryParser.g:403:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
+            // xquery/XQueryParser.g:403:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_CopyNamespacesDecl1820); if (this.state.failed) return retval;
@@ -22467,7 +22470,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:405:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
+    // xquery/XQueryParser.g:407:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
     // $ANTLR start "p_PreserveMode"
     p_PreserveMode: function() {
         var retval = new XQueryParser.p_PreserveMode_return();
@@ -22481,11 +22484,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:406:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             var alt14=2;
             var LA14_0 = this.input.LA(1);
 
@@ -22504,7 +22507,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt14) {
                 case 1 :
-                    // xquery/XQueryParser.g:406:12: k+= PRESERVE
+                    // xquery/XQueryParser.g:408:12: k+= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_p_PreserveMode1865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22517,7 +22520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:406:26: k+= NO_PRESERVE
+                    // xquery/XQueryParser.g:408:26: k+= NO_PRESERVE
                     k=this.match(this.input,NO_PRESERVE,XQueryParser.FOLLOW_NO_PRESERVE_in_p_PreserveMode1871); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22571,7 +22574,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:410:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
+    // xquery/XQueryParser.g:412:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
     // $ANTLR start "p_InheritMode"
     p_InheritMode: function() {
         var retval = new XQueryParser.p_InheritMode_return();
@@ -22585,11 +22588,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:411:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             var alt15=2;
             var LA15_0 = this.input.LA(1);
 
@@ -22608,7 +22611,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt15) {
                 case 1 :
-                    // xquery/XQueryParser.g:411:12: k+= INHERIT
+                    // xquery/XQueryParser.g:413:12: k+= INHERIT
                     k=this.match(this.input,INHERIT,XQueryParser.FOLLOW_INHERIT_in_p_InheritMode1903); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22621,7 +22624,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:411:25: k+= NO_INHERIT
+                    // xquery/XQueryParser.g:413:25: k+= NO_INHERIT
                     k=this.match(this.input,NO_INHERIT,XQueryParser.FOLLOW_NO_INHERIT_in_p_InheritMode1909); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22675,7 +22678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:415:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
+    // xquery/XQueryParser.g:417:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
     // $ANTLR start "pm_DecimalFormatDecl"
     pm_DecimalFormatDecl: function() {
         var retval = new XQueryParser.pm_DecimalFormatDecl_return();
@@ -22695,8 +22698,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON38_tree=null;
 
         try {
-            // xquery/XQueryParser.g:416:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
-            // xquery/XQueryParser.g:416:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
+            // xquery/XQueryParser.g:418:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
+            // xquery/XQueryParser.g:418:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DecimalFormatDecl1948); if (this.state.failed) return retval;
@@ -22707,7 +22710,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:416:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
+            // xquery/XQueryParser.g:418:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
             var alt16=2;
             var LA16_0 = this.input.LA(1);
 
@@ -22726,9 +22729,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt16) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:38: k= DECIMAL_FORMAT p_QName
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:38: k= DECIMAL_FORMAT p_QName
                     k=this.match(this.input,DECIMAL_FORMAT,XQueryParser.FOLLOW_DECIMAL_FORMAT_in_pm_DecimalFormatDecl1956); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22750,9 +22753,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:82: k= DEFAULT k= DECIMAL_FORMAT
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:82: k= DEFAULT k= DECIMAL_FORMAT
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_pm_DecimalFormatDecl1968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22778,7 +22781,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:416:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
+            // xquery/XQueryParser.g:418:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
             loop17:
             do {
                 var alt17=2;
@@ -22791,7 +22794,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt17) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:142: p_DFPropertyName EQUAL p_StringLiteral
+                    // xquery/XQueryParser.g:418:142: p_DFPropertyName EQUAL p_StringLiteral
                     this.pushFollow(XQueryParser.FOLLOW_p_DFPropertyName_in_pm_DecimalFormatDecl1981);
                     p_DFPropertyName35=this.p_DFPropertyName();
 
@@ -22859,7 +22862,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:420:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
+    // xquery/XQueryParser.g:422:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
     // $ANTLR start "p_DFPropertyName"
     p_DFPropertyName: function() {
         var retval = new XQueryParser.p_DFPropertyName_return();
@@ -22872,11 +22875,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:421:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             var alt18=10;
             switch ( this.input.LA(1) ) {
             case DECIMAL_SEPARATOR:
@@ -22919,7 +22922,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt18) {
                 case 1 :
-                    // xquery/XQueryParser.g:421:12: k= DECIMAL_SEPARATOR
+                    // xquery/XQueryParser.g:423:12: k= DECIMAL_SEPARATOR
                     k=this.match(this.input,DECIMAL_SEPARATOR,XQueryParser.FOLLOW_DECIMAL_SEPARATOR_in_p_DFPropertyName2018); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22929,7 +22932,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:421:34: k= GROUPING_SEPARATOR
+                    // xquery/XQueryParser.g:423:34: k= GROUPING_SEPARATOR
                     k=this.match(this.input,GROUPING_SEPARATOR,XQueryParser.FOLLOW_GROUPING_SEPARATOR_in_p_DFPropertyName2024); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22939,7 +22942,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:421:57: k= INFINITY
+                    // xquery/XQueryParser.g:423:57: k= INFINITY
                     k=this.match(this.input,INFINITY,XQueryParser.FOLLOW_INFINITY_in_p_DFPropertyName2030); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22949,7 +22952,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:421:70: k= MINUS_SIGN
+                    // xquery/XQueryParser.g:423:70: k= MINUS_SIGN
                     k=this.match(this.input,MINUS_SIGN,XQueryParser.FOLLOW_MINUS_SIGN_in_p_DFPropertyName2036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22959,7 +22962,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:421:85: k= NAN
+                    // xquery/XQueryParser.g:423:85: k= NAN
                     k=this.match(this.input,NAN,XQueryParser.FOLLOW_NAN_in_p_DFPropertyName2042); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22969,7 +22972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:421:93: k= PERCENT
+                    // xquery/XQueryParser.g:423:93: k= PERCENT
                     k=this.match(this.input,PERCENT,XQueryParser.FOLLOW_PERCENT_in_p_DFPropertyName2048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22979,7 +22982,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:421:105: k= PER_MILLE
+                    // xquery/XQueryParser.g:423:105: k= PER_MILLE
                     k=this.match(this.input,PER_MILLE,XQueryParser.FOLLOW_PER_MILLE_in_p_DFPropertyName2054); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22989,7 +22992,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:421:119: k= ZERO_DIGIT
+                    // xquery/XQueryParser.g:423:119: k= ZERO_DIGIT
                     k=this.match(this.input,ZERO_DIGIT,XQueryParser.FOLLOW_ZERO_DIGIT_in_p_DFPropertyName2060); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22999,7 +23002,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:421:134: k= DIGIT
+                    // xquery/XQueryParser.g:423:134: k= DIGIT
                     k=this.match(this.input,DIGIT,XQueryParser.FOLLOW_DIGIT_in_p_DFPropertyName2066); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23009,7 +23012,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:421:144: k= PATTERN_SEPARATOR
+                    // xquery/XQueryParser.g:423:144: k= PATTERN_SEPARATOR
                     k=this.match(this.input,PATTERN_SEPARATOR,XQueryParser.FOLLOW_PATTERN_SEPARATOR_in_p_DFPropertyName2072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23060,7 +23063,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:425:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
+    // xquery/XQueryParser.g:427:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
     // $ANTLR start "p_Import"
     p_Import: function() {
         var retval = new XQueryParser.p_Import_return();
@@ -23073,7 +23076,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:426:9: ( pm_SchemaImport | pm_ModuleImport )
+            // xquery/XQueryParser.g:428:9: ( pm_SchemaImport | pm_ModuleImport )
             var alt19=2;
             var LA19_0 = this.input.LA(1);
 
@@ -23103,7 +23106,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt19) {
                 case 1 :
-                    // xquery/XQueryParser.g:426:11: pm_SchemaImport
+                    // xquery/XQueryParser.g:428:11: pm_SchemaImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_SchemaImport_in_p_Import2101);
@@ -23116,7 +23119,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:426:29: pm_ModuleImport
+                    // xquery/XQueryParser.g:428:29: pm_ModuleImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ModuleImport_in_p_Import2105);
@@ -23163,7 +23166,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:430:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:432:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_SchemaImport"
     pm_SchemaImport: function() {
         var retval = new XQueryParser.pm_SchemaImport_return();
@@ -23189,8 +23192,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_SchemaPrefix=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SchemaPrefix");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:431:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:431:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:433:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:433:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_SchemaImport2141); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -23203,7 +23206,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:431:61: (sp= p_SchemaPrefix )?
+            // xquery/XQueryParser.g:433:61: (sp= p_SchemaPrefix )?
             var alt20=2;
             var LA20_0 = this.input.LA(1);
 
@@ -23212,7 +23215,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt20) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:61: sp= p_SchemaPrefix
+                    // xquery/XQueryParser.g:433:61: sp= p_SchemaPrefix
                     this.pushFollow(XQueryParser.FOLLOW_p_SchemaPrefix_in_pm_SchemaImport2153);
                     sp=this.p_SchemaPrefix();
 
@@ -23231,7 +23234,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:431:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:433:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt22=2;
             var LA22_0 = this.input.LA(1);
 
@@ -23240,7 +23243,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt22) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_SchemaImport2163); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -23256,7 +23259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:431:138: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:138: ( COMMA ah+= p_StringLiteral )*
                     loop21:
                     do {
                         var alt21=2;
@@ -23269,7 +23272,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt21) {
                         case 1 :
-                            // xquery/XQueryParser.g:431:139: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:433:139: COMMA ah+= p_StringLiteral
                             COMMA41=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_SchemaImport2172); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA41);
 
@@ -23315,19 +23318,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 432:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+            // 434:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:432:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:434:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(SchemaImport, "SchemaImport"), root_1);
 
-                // xquery/XQueryParser.g:432:35: ^( SchemaPrefix ( $sp)? )
+                // xquery/XQueryParser.g:434:35: ^( SchemaPrefix ( $sp)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(SchemaPrefix, "SchemaPrefix"), root_2);
 
-                // xquery/XQueryParser.g:432:50: ( $sp)?
+                // xquery/XQueryParser.g:434:50: ( $sp)?
                 if ( stream_sp.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_sp.nextTree());
 
@@ -23337,12 +23340,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:432:60: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:434:60: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:432:70: ( $ah)*
+                // xquery/XQueryParser.g:434:70: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -23393,7 +23396,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:436:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
+    // xquery/XQueryParser.g:438:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
     // $ANTLR start "p_SchemaPrefix"
     p_SchemaPrefix: function() {
         var retval = new XQueryParser.p_SchemaPrefix_return();
@@ -23413,7 +23416,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_DEFAULT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token DEFAULT");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:437:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
+            // xquery/XQueryParser.g:439:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
             var alt23=2;
             var LA23_0 = this.input.LA(1);
 
@@ -23432,7 +23435,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt23) {
                 case 1 :
-                    // xquery/XQueryParser.g:437:11: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:439:11: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_SchemaPrefix2252); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -23462,9 +23465,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_nn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nn",nn!=null?nn.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 438:17: -> ^( NamespaceName $nn)
+                    // 440:17: -> ^( NamespaceName $nn)
                     {
-                        // xquery/XQueryParser.g:438:20: ^( NamespaceName $nn)
+                        // xquery/XQueryParser.g:440:20: ^( NamespaceName $nn)
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_1);
@@ -23480,7 +23483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:439:11: k= DEFAULT k= ELEMENT k= NAMESPACE
+                    // xquery/XQueryParser.g:441:11: k= DEFAULT k= ELEMENT k= NAMESPACE
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SchemaPrefix2299); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_DEFAULT.add(k);
 
@@ -23512,7 +23515,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 440:17: -> DefaultElementNamespace
+                    // 442:17: -> DefaultElementNamespace
                     {
                         this.adaptor.addChild(root_0, this.adaptor.create(DefaultElementNamespace, "DefaultElementNamespace"));
 
@@ -23556,7 +23559,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:444:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:446:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_ModuleImport"
     pm_ModuleImport: function() {
         var retval = new XQueryParser.pm_ModuleImport_return();
@@ -23586,8 +23589,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:445:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:445:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:447:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:447:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_ModuleImport2361); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -23600,7 +23603,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:445:59: (k= NAMESPACE nn= p_NCName EQUAL )?
+            // xquery/XQueryParser.g:447:59: (k= NAMESPACE nn= p_NCName EQUAL )?
             var alt24=2;
             var LA24_0 = this.input.LA(1);
 
@@ -23609,7 +23612,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt24) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:60: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:447:60: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_pm_ModuleImport2374); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -23637,7 +23640,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:445:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:447:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt26=2;
             var LA26_0 = this.input.LA(1);
 
@@ -23646,7 +23649,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt26) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_ModuleImport2393); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -23662,7 +23665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:445:167: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:167: ( COMMA ah+= p_StringLiteral )*
                     loop25:
                     do {
                         var alt25=2;
@@ -23675,7 +23678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt25) {
                         case 1 :
-                            // xquery/XQueryParser.g:445:168: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:447:168: COMMA ah+= p_StringLiteral
                             COMMA45=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_ModuleImport2402); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA45);
 
@@ -23721,19 +23724,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 446:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+            // 448:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:446:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:448:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleImport, "ModuleImport"), root_1);
 
-                // xquery/XQueryParser.g:446:35: ^( NamespaceName ( $nn)? )
+                // xquery/XQueryParser.g:448:35: ^( NamespaceName ( $nn)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_2);
 
-                // xquery/XQueryParser.g:446:51: ( $nn)?
+                // xquery/XQueryParser.g:448:51: ( $nn)?
                 if ( stream_nn.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nn.nextTree());
 
@@ -23743,12 +23746,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:446:61: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:448:61: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:446:71: ( $ah)*
+                // xquery/XQueryParser.g:448:71: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -23799,7 +23802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:450:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
+    // xquery/XQueryParser.g:452:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
     // $ANTLR start "pm_NamespaceDecl"
     pm_NamespaceDecl: function() {
         var retval = new XQueryParser.pm_NamespaceDecl_return();
@@ -23823,8 +23826,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:451:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
-            // xquery/XQueryParser.g:451:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:453:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
+            // xquery/XQueryParser.g:453:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_NamespaceDecl2481); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -23870,9 +23873,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 452:17: -> ^( NamespaceDecl $nn $us)
+            // 454:17: -> ^( NamespaceDecl $nn $us)
             {
-                // xquery/XQueryParser.g:452:20: ^( NamespaceDecl $nn $us)
+                // xquery/XQueryParser.g:454:20: ^( NamespaceDecl $nn $us)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecl, "NamespaceDecl"), root_1);
@@ -23921,7 +23924,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:456:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:458:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultNamespaceDecl"
     pm_DefaultNamespaceDecl: function() {
         var retval = new XQueryParser.pm_DefaultNamespaceDecl_return();
@@ -23937,8 +23940,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON50_tree=null;
 
         try {
-            // xquery/XQueryParser.g:457:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:457:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:459:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:459:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultNamespaceDecl2558); if (this.state.failed) return retval;
@@ -23957,7 +23960,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:457:61: (k= ELEMENT | k= FUNCTION )
+            // xquery/XQueryParser.g:459:61: (k= ELEMENT | k= FUNCTION )
             var alt27=2;
             var LA27_0 = this.input.LA(1);
 
@@ -23976,7 +23979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt27) {
                 case 1 :
-                    // xquery/XQueryParser.g:457:62: k= ELEMENT
+                    // xquery/XQueryParser.g:459:62: k= ELEMENT
                     k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_DefaultNamespaceDecl2571); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23986,7 +23989,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:457:74: k= FUNCTION
+                    // xquery/XQueryParser.g:459:74: k= FUNCTION
                     k=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_pm_DefaultNamespaceDecl2577); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24056,7 +24059,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:461:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
+    // xquery/XQueryParser.g:463:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
     // $ANTLR start "pm_AnnotatedDecl"
     pm_AnnotatedDecl: function() {
         var retval = new XQueryParser.pm_AnnotatedDecl_return();
@@ -24073,8 +24076,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON53_tree=null;
 
         try {
-            // xquery/XQueryParser.g:462:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
-            // xquery/XQueryParser.g:462:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
+            // xquery/XQueryParser.g:464:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
+            // xquery/XQueryParser.g:464:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_AnnotatedDecl2618); if (this.state.failed) return retval;
@@ -24085,7 +24088,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:462:36: ( p_Annotation )*
+            // xquery/XQueryParser.g:464:36: ( p_Annotation )*
             loop28:
             do {
                 var alt28=2;
@@ -24098,7 +24101,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt28) {
                 case 1 :
-                    // xquery/XQueryParser.g:462:36: p_Annotation
+                    // xquery/XQueryParser.g:464:36: p_Annotation
                     this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_pm_AnnotatedDecl2622);
                     p_Annotation51=this.p_Annotation();
 
@@ -24161,7 +24164,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:464:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
+    // xquery/XQueryParser.g:466:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
     // $ANTLR start "pg_AnnotatedDecl"
     pg_AnnotatedDecl: function() {
         var retval = new XQueryParser.pg_AnnotatedDecl_return();
@@ -24177,7 +24180,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:465:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
+            // xquery/XQueryParser.g:467:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
             var alt29=5;
             var LA29_0 = this.input.LA(1);
 
@@ -24208,7 +24211,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt29) {
                 case 1 :
-                    // xquery/XQueryParser.g:465:11: p_VarDecl
+                    // xquery/XQueryParser.g:467:11: p_VarDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_VarDecl_in_pg_AnnotatedDecl2651);
@@ -24221,7 +24224,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:466:11: pm_FunctionDecl
+                    // xquery/XQueryParser.g:468:11: pm_FunctionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_FunctionDecl_in_pg_AnnotatedDecl2663);
@@ -24234,7 +24237,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:467:11: {...}? => p_CollectionDecl
+                    // xquery/XQueryParser.g:469:11: {...}? => p_CollectionDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24251,7 +24254,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:468:11: {...}? => p_IndexDecl
+                    // xquery/XQueryParser.g:470:11: {...}? => p_IndexDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24268,7 +24271,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:469:11: {...}? => p_ICDecl
+                    // xquery/XQueryParser.g:471:11: {...}? => p_ICDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24319,7 +24322,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:473:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
+    // xquery/XQueryParser.g:475:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
     // $ANTLR start "p_Annotation"
     p_Annotation: function() {
         var retval = new XQueryParser.p_Annotation_return();
@@ -24341,8 +24344,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var RPAREN65_tree=null;
 
         try {
-            // xquery/XQueryParser.g:474:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
-            // xquery/XQueryParser.g:474:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
+            // xquery/XQueryParser.g:476:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             root_0 = this.adaptor.nil();
 
             ANN_PERCENT59=this.match(this.input,ANN_PERCENT,XQueryParser.FOLLOW_ANN_PERCENT_in_p_Annotation2734); if (this.state.failed) return retval;
@@ -24356,7 +24359,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName60.getTree());
-            // xquery/XQueryParser.g:474:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             var alt31=2;
             var LA31_0 = this.input.LA(1);
 
@@ -24365,7 +24368,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt31) {
                 case 1 :
-                    // xquery/XQueryParser.g:474:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
+                    // xquery/XQueryParser.g:476:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
                     LPAREN61=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_Annotation2739); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     LPAREN61_tree = this.adaptor.create(LPAREN61);
@@ -24377,7 +24380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal62.getTree());
-                    // xquery/XQueryParser.g:474:49: ( COMMA p_Literal )*
+                    // xquery/XQueryParser.g:476:49: ( COMMA p_Literal )*
                     loop30:
                     do {
                         var alt30=2;
@@ -24390,7 +24393,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt30) {
                         case 1 :
-                            // xquery/XQueryParser.g:474:50: COMMA p_Literal
+                            // xquery/XQueryParser.g:476:50: COMMA p_Literal
                             COMMA63=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Annotation2744); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             COMMA63_tree = this.adaptor.create(COMMA63);
@@ -24458,7 +24461,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:478:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
+    // xquery/XQueryParser.g:480:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
     // $ANTLR start "p_VarDecl"
     p_VarDecl: function() {
         var retval = new XQueryParser.p_VarDecl_return();
@@ -24488,8 +24491,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_VarDefaultValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarDefaultValue");
         var stream_p_VarValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarValue");
         try {
-            // xquery/XQueryParser.g:479:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
-            // xquery/XQueryParser.g:479:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
+            // xquery/XQueryParser.g:481:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDecl2780); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_VARIABLE.add(k);
 
@@ -24508,7 +24511,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:479:86: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:481:86: (td= p_TypeDeclaration )?
             var alt32=2;
             var LA32_0 = this.input.LA(1);
 
@@ -24517,7 +24520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt32) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:86: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:481:86: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDecl2796);
                     td=this.p_TypeDeclaration();
 
@@ -24530,7 +24533,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:479:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             var alt34=2;
             var LA34_0 = this.input.LA(1);
 
@@ -24549,9 +24552,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt34) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:108: BIND vv= p_VarValue
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:108: BIND vv= p_VarValue
                     BIND66=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2801); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_BIND.add(BIND66);
 
@@ -24568,16 +24571,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_p_VarDecl2813); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:479:157: ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:157: ( BIND vdv= p_VarDefaultValue )?
                     var alt33=2;
                     var LA33_0 = this.input.LA(1);
 
@@ -24586,7 +24589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt33) {
                         case 1 :
-                            // xquery/XQueryParser.g:479:158: BIND vdv= p_VarDefaultValue
+                            // xquery/XQueryParser.g:481:158: BIND vdv= p_VarDefaultValue
                             BIND67=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2818); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_BIND.add(BIND67);
 
@@ -24614,7 +24617,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: vv, vdv, qn, td
+            // elements: td, vv, vdv, qn
             // token labels: 
             // rule labels: qn, vv, retval, vdv, td
             // token list labels: 
@@ -24628,20 +24631,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 480:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+            // 482:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
             {
-                // xquery/XQueryParser.g:480:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+                // xquery/XQueryParser.g:482:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VarDecl, "VarDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:480:34: ^( VarType ( $td)? )
+                // xquery/XQueryParser.g:482:34: ^( VarType ( $td)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarType, "VarType"), root_2);
 
-                // xquery/XQueryParser.g:480:44: ( $td)?
+                // xquery/XQueryParser.g:482:44: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_td.nextTree());
 
@@ -24650,23 +24653,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:480:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
+                // xquery/XQueryParser.g:482:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarValue, "VarValue"), root_2);
 
-                // xquery/XQueryParser.g:480:61: ( $vv)?
+                // xquery/XQueryParser.g:482:61: ( $vv)?
                 if ( stream_vv.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_vv.nextTree());
 
                 }
                 stream_vv.reset();
-                // xquery/XQueryParser.g:480:66: ^( VarDefaultValue ( $vdv)? )
+                // xquery/XQueryParser.g:482:66: ^( VarDefaultValue ( $vdv)? )
                 {
                 var root_3 = this.adaptor.nil();
                 root_3 = this.adaptor.becomeRoot(this.adaptor.create(VarDefaultValue, "VarDefaultValue"), root_3);
 
-                // xquery/XQueryParser.g:480:84: ( $vdv)?
+                // xquery/XQueryParser.g:482:84: ( $vdv)?
                 if ( stream_vdv.hasNext() ) {
                     this.adaptor.addChild(root_3, stream_vdv.nextTree());
 
@@ -24720,7 +24723,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:484:1: p_VarValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:486:1: p_VarValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarValue"
     p_VarValue: function() {
         var retval = new XQueryParser.p_VarValue_return();
@@ -24732,8 +24735,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:485:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:485:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:487:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:487:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarValue2901);
@@ -24778,7 +24781,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:489:1: p_VarDefaultValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:491:1: p_VarDefaultValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarDefaultValue"
     p_VarDefaultValue: function() {
         var retval = new XQueryParser.p_VarDefaultValue_return();
@@ -24790,8 +24793,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:490:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:490:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:492:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:492:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDefaultValue2928);
@@ -24836,7 +24839,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:494:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:496:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
     // $ANTLR start "pm_ContextItemDecl"
     pm_ContextItemDecl: function() {
         var retval = new XQueryParser.pm_ContextItemDecl_return();
@@ -24858,8 +24861,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON75_tree=null;
 
         try {
-            // xquery/XQueryParser.g:495:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
-            // xquery/XQueryParser.g:495:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:497:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
+            // xquery/XQueryParser.g:497:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ContextItemDecl2957); if (this.state.failed) return retval;
@@ -24886,7 +24889,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:495:83: (k= AS p_ItemType )?
+            // xquery/XQueryParser.g:497:83: (k= AS p_ItemType )?
             var alt35=2;
             var LA35_0 = this.input.LA(1);
 
@@ -24895,7 +24898,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt35) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:84: k= AS p_ItemType
+                    // xquery/XQueryParser.g:497:84: k= AS p_ItemType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_ContextItemDecl2976); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24916,7 +24919,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:495:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:497:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
             var alt37=2;
             var LA37_0 = this.input.LA(1);
 
@@ -24935,9 +24938,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt37) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:119: BIND p_VarValue
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:119: BIND p_VarValue
                     BIND71=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl2986); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     BIND71_tree = this.adaptor.create(BIND71);
@@ -24956,9 +24959,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_ContextItemDecl2996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24967,7 +24970,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:495:165: ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:165: ( BIND p_VarDefaultValue )?
                     var alt36=2;
                     var LA36_0 = this.input.LA(1);
 
@@ -24976,7 +24979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt36) {
                         case 1 :
-                            // xquery/XQueryParser.g:495:166: BIND p_VarDefaultValue
+                            // xquery/XQueryParser.g:497:166: BIND p_VarDefaultValue
                             BIND73=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl3001); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             BIND73_tree = this.adaptor.create(BIND73);
@@ -25044,7 +25047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:500:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
+    // xquery/XQueryParser.g:502:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
     // $ANTLR start "pm_FunctionDecl"
     pm_FunctionDecl: function() {
         var retval = new XQueryParser.pm_FunctionDecl_return();
@@ -25080,9 +25083,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_FQName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_FQName");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:501:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )?
+            // xquery/XQueryParser.g:503:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )?
             var alt38=2;
             var LA38_0 = this.input.LA(1);
 
@@ -25091,7 +25094,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt38) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:12: {...}? =>k= UPDATING
+                    // xquery/XQueryParser.g:503:12: {...}? =>k= UPDATING
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "pm_FunctionDecl", "this.lc(XQU)");
@@ -25123,7 +25126,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             LPAREN76=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_pm_FunctionDecl3058); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN76);
 
-            // xquery/XQueryParser.g:501:106: (pl= p_ParamList )?
+            // xquery/XQueryParser.g:503:106: (pl= p_ParamList )?
             var alt39=2;
             var LA39_0 = this.input.LA(1);
 
@@ -25132,7 +25135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt39) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:106: pl= p_ParamList
+                    // xquery/XQueryParser.g:503:106: pl= p_ParamList
                     this.pushFollow(XQueryParser.FOLLOW_p_ParamList_in_pm_FunctionDecl3062);
                     pl=this.p_ParamList();
 
@@ -25148,7 +25151,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             RPAREN77=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_pm_FunctionDecl3065); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN77);
 
-            // xquery/XQueryParser.g:501:127: (k= AS st= p_SequenceType )?
+            // xquery/XQueryParser.g:503:127: (k= AS st= p_SequenceType )?
             var alt40=2;
             var LA40_0 = this.input.LA(1);
 
@@ -25157,7 +25160,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt40) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:128: k= AS st= p_SequenceType
+                    // xquery/XQueryParser.g:503:128: k= AS st= p_SequenceType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_FunctionDecl3070); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AS.add(k);
 
@@ -25176,7 +25179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:501:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
             var alt41=2;
             var LA41_0 = this.input.LA(1);
 
@@ -25195,7 +25198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt41) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
+                    // xquery/XQueryParser.g:503:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
                     LBRACKET78=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_FunctionDecl3081); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET78);
 
@@ -25212,7 +25215,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:501:221: k= EXTERNAL
+                    // xquery/XQueryParser.g:503:221: k= EXTERNAL
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_FunctionDecl3093); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
@@ -25228,34 +25231,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: st, pl, qn, soe
+            // elements: pl, soe, qn, st
             // token labels: 
-            // rule labels: soe, qn, retval, pl, st
+            // rule labels: qn, soe, retval, pl, st
             // token list labels: 
             // rule list labels: 
             if ( this.state.backtracking===0 ) {
             retval.tree = root_0;
-            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_qn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token qn",qn!=null?qn.tree:null);
+            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_pl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token pl",pl!=null?pl.tree:null);
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 502:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+            // 504:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
             {
-                // xquery/XQueryParser.g:502:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+                // xquery/XQueryParser.g:504:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(FunctionDecl, "FunctionDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:502:39: ^( ParamList ( $pl)? )
+                // xquery/XQueryParser.g:504:39: ^( ParamList ( $pl)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ParamList, "ParamList"), root_2);
 
-                // xquery/XQueryParser.g:502:51: ( $pl)?
+                // xquery/XQueryParser.g:504:51: ( $pl)?
                 if ( stream_pl.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pl.nextTree());
 
@@ -25264,12 +25267,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:57: ^( ReturnType ( $st)? )
+                // xquery/XQueryParser.g:504:57: ^( ReturnType ( $st)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ReturnType, "ReturnType"), root_2);
 
-                // xquery/XQueryParser.g:502:70: ( $st)?
+                // xquery/XQueryParser.g:504:70: ( $st)?
                 if ( stream_st.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_st.nextTree());
 
@@ -25278,7 +25281,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:76: ( $soe)?
+                // xquery/XQueryParser.g:504:76: ( $soe)?
                 if ( stream_soe.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_soe.nextTree());
 
@@ -25326,7 +25329,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:506:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
+    // xquery/XQueryParser.g:508:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
     // $ANTLR start "p_ParamList"
     p_ParamList: function() {
         var retval = new XQueryParser.p_ParamList_return();
@@ -25341,8 +25344,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_COMMA=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COMMA");
         var stream_p_Param=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Param");
         try {
-            // xquery/XQueryParser.g:507:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
-            // xquery/XQueryParser.g:507:11: p+= p_Param ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
+            // xquery/XQueryParser.g:509:11: p+= p_Param ( COMMA p+= p_Param )*
             this.pushFollow(XQueryParser.FOLLOW_p_Param_in_p_ParamList3170);
             p=this.p_Param();
 
@@ -25352,7 +25355,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_p)) list_p = [];
             list_p.push(p.getTree());
 
-            // xquery/XQueryParser.g:507:22: ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:22: ( COMMA p+= p_Param )*
             loop42:
             do {
                 var alt42=2;
@@ -25365,7 +25368,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt42) {
                 case 1 :
-                    // xquery/XQueryParser.g:507:23: COMMA p+= p_Param
+                    // xquery/XQueryParser.g:509:23: COMMA p+= p_Param
                     COMMA80=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ParamList3173); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA80);
 
@@ -25400,7 +25403,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_p=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token p",list_p);
             root_0 = this.adaptor.nil();
-            // 508:17: -> ( $p)+
+            // 510:17: -> ( $p)+
             {
                 if ( !(stream_p.hasNext()) ) {
                     throw new org.antlr.runtime.tree.RewriteEarlyExitException();
@@ -25449,7 +25452,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:512:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
+    // xquery/XQueryParser.g:514:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
     // $ANTLR start "p_Param"
     p_Param: function() {
         var retval = new XQueryParser.p_Param_return();
@@ -25466,8 +25469,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_TypeDeclaration=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_TypeDeclaration");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:513:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
-            // xquery/XQueryParser.g:513:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
+            // xquery/XQueryParser.g:515:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
             d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_Param3237); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DOLLAR.add(d);
 
@@ -25480,7 +25483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:513:60: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:60: (td= p_TypeDeclaration )?
             var alt43=2;
             var LA43_0 = this.input.LA(1);
 
@@ -25489,7 +25492,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt43) {
                 case 1 :
-                    // xquery/XQueryParser.g:513:60: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:515:60: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_Param3247);
                     td=this.p_TypeDeclaration();
 
@@ -25505,7 +25508,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: qn, td
+            // elements: td, qn
             // token labels: 
             // rule labels: qn, retval, td
             // token list labels: 
@@ -25517,15 +25520,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 514:17: -> ^( Param $qn ( $td)? )
+            // 516:17: -> ^( Param $qn ( $td)? )
             {
-                // xquery/XQueryParser.g:514:20: ^( Param $qn ( $td)? )
+                // xquery/XQueryParser.g:516:20: ^( Param $qn ( $td)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Param, "Param"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:514:32: ( $td)?
+                // xquery/XQueryParser.g:516:32: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_td.nextTree());
 
@@ -25573,7 +25576,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:518:1: pm_FunctionBody : p_EnclosedExpr ;
+    // xquery/XQueryParser.g:520:1: pm_FunctionBody : p_EnclosedExpr ;
     // $ANTLR start "pm_FunctionBody"
     pm_FunctionBody: function() {
         var retval = new XQueryParser.pm_FunctionBody_return();
@@ -25585,8 +25588,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:519:9: ( p_EnclosedExpr )
-            // xquery/XQueryParser.g:519:11: p_EnclosedExpr
+            // xquery/XQueryParser.g:521:9: ( p_EnclosedExpr )
+            // xquery/XQueryParser.g:521:11: p_EnclosedExpr
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_EnclosedExpr_in_pm_FunctionBody3303);
@@ -25631,7 +25634,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:524:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
+    // xquery/XQueryParser.g:526:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
     // $ANTLR start "p_EnclosedExpr"
     p_EnclosedExpr: function() {
         var retval = new XQueryParser.p_EnclosedExpr_return();
@@ -25649,8 +25652,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_RBRACKET=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RBRACKET");
         var stream_p_Expr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Expr");
         try {
-            // xquery/XQueryParser.g:525:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
-            // xquery/XQueryParser.g:525:11: LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:527:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
+            // xquery/XQueryParser.g:527:11: LBRACKET p_Expr[true,true] RBRACKET
             LBRACKET82=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_EnclosedExpr3330); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET82);
 
@@ -25676,9 +25679,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 526:17: -> ^( EnclosedExpr p_Expr )
+            // 528:17: -> ^( EnclosedExpr p_Expr )
             {
-                // xquery/XQueryParser.g:526:20: ^( EnclosedExpr p_Expr )
+                // xquery/XQueryParser.g:528:20: ^( EnclosedExpr p_Expr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(EnclosedExpr, "EnclosedExpr"), root_1);
@@ -25726,7 +25729,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:530:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:532:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_OptionDecl"
     pm_OptionDecl: function() {
         var retval = new XQueryParser.pm_OptionDecl_return();
@@ -25743,8 +25746,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON87_tree=null;
 
         try {
-            // xquery/XQueryParser.g:531:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:531:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:533:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:533:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OptionDecl3387); if (this.state.failed) return retval;
@@ -25816,7 +25819,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
+    // xquery/XQueryParser.g:537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
     // $ANTLR start "pm_QueryBody"
     pm_QueryBody: function() {
         var retval = new XQueryParser.pm_QueryBody_return();
@@ -25829,12 +25832,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:536:9: ({...}? => p_Program | p_Expr[true,true] )
+            // xquery/XQueryParser.g:538:9: ({...}? => p_Program | p_Expr[true,true] )
             var alt44=2;
             alt44 = this.dfa44.predict(this.input);
             switch (alt44) {
                 case 1 :
-                    // xquery/XQueryParser.g:536:11: {...}? => p_Program
+                    // xquery/XQueryParser.g:538:11: {...}? => p_Program
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQS))) ) {
@@ -25851,7 +25854,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:537:11: p_Expr[true,true]
+                    // xquery/XQueryParser.g:539:11: p_Expr[true,true]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_QueryBody3442);
@@ -25898,7 +25901,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:547:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
+    // xquery/XQueryParser.g:549:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
     // $ANTLR start "p_Expr"
     p_Expr: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Expr_return();
@@ -25913,8 +25916,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var COMMA90_tree=null;
 
         try {
-            // xquery/XQueryParser.g:548:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
-            // xquery/XQueryParser.g:548:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:550:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
+            // xquery/XQueryParser.g:550:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Expr3478);
@@ -25926,7 +25929,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (!allowConcat) throw new Exception(); 
             }
-            // xquery/XQueryParser.g:549:11: ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:551:11: ( COMMA p_ExprSingle[$strict] )*
             loop45:
             do {
                 var alt45=2;
@@ -25939,7 +25942,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt45) {
                 case 1 :
-                    // xquery/XQueryParser.g:549:12: COMMA p_ExprSingle[$strict]
+                    // xquery/XQueryParser.g:551:12: COMMA p_ExprSingle[$strict]
                     COMMA90=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Expr3494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     COMMA90_tree = this.adaptor.create(COMMA90);
@@ -26006,7 +26009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
+    // xquery/XQueryParser.g:573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
     // $ANTLR start "p_ExprSingle"
     p_ExprSingle: function(strict) {
         var retval = new XQueryParser.p_ExprSingle_return();
@@ -26023,12 +26026,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:572:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
+            // xquery/XQueryParser.g:574:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
             var alt46=6;
             alt46 = this.dfa46.predict(this.input);
             switch (alt46) {
                 case 1 :
-                    // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
+                    // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_FLWORHybrid_in_p_ExprSingle3563);
@@ -26041,7 +26044,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:573:11: ( IF LPAREN )=> p_IfHybrid[$strict]
+                    // xquery/XQueryParser.g:575:11: ( IF LPAREN )=> p_IfHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_IfHybrid_in_p_ExprSingle3593);
@@ -26054,7 +26057,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
+                    // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_SwitchHybrid_in_p_ExprSingle3619);
@@ -26067,7 +26070,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
+                    // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeswitchHybrid_in_p_ExprSingle3641);
@@ -26080,7 +26083,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
+                    // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TryCatchHybrid_in_p_ExprSingle3668);
@@ -26093,7 +26096,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:577:11: p_ExprSimple
+                    // xquery/XQueryParser.g:579:11: p_ExprSimple
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ExprSingle3681);
@@ -26140,7 +26143,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:581:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
+    // xquery/XQueryParser.g:583:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
     // $ANTLR start "p_FLWORHybrid"
     p_FLWORHybrid: function(strict) {
         var retval = new XQueryParser.p_FLWORHybrid_return();
@@ -26154,8 +26157,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:582:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
-            // xquery/XQueryParser.g:582:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
+            // xquery/XQueryParser.g:584:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
+            // xquery/XQueryParser.g:584:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORHybrid3708);
@@ -26164,7 +26167,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause98.getTree());
-            // xquery/XQueryParser.g:582:27: ( p_IntermediateClause )*
+            // xquery/XQueryParser.g:584:27: ( p_IntermediateClause )*
             loop47:
             do {
                 var alt47=2;
@@ -26177,7 +26180,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt47) {
                 case 1 :
-                    // xquery/XQueryParser.g:582:27: p_IntermediateClause
+                    // xquery/XQueryParser.g:584:27: p_IntermediateClause
                     this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORHybrid3710);
                     p_IntermediateClause99=this.p_IntermediateClause();
 
@@ -26235,7 +26238,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:586:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
+    // xquery/XQueryParser.g:588:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
     // $ANTLR start "p_InitialClause"
     p_InitialClause: function() {
         var retval = new XQueryParser.p_InitialClause_return();
@@ -26249,7 +26252,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:587:9: ( p_ForClause | p_LetClause | p_WindowClause )
+            // xquery/XQueryParser.g:589:9: ( p_ForClause | p_LetClause | p_WindowClause )
             var alt48=3;
             var LA48_0 = this.input.LA(1);
 
@@ -26282,7 +26285,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt48) {
                 case 1 :
-                    // xquery/XQueryParser.g:587:11: p_ForClause
+                    // xquery/XQueryParser.g:589:11: p_ForClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ForClause_in_p_InitialClause3740);
@@ -26295,7 +26298,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:587:25: p_LetClause
+                    // xquery/XQueryParser.g:589:25: p_LetClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_LetClause_in_p_InitialClause3744);
@@ -26308,7 +26311,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:587:39: p_WindowClause
+                    // xquery/XQueryParser.g:589:39: p_WindowClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WindowClause_in_p_InitialClause3748);
@@ -26355,7 +26358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:591:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
+    // xquery/XQueryParser.g:593:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
     // $ANTLR start "p_IntermediateClause"
     p_IntermediateClause: function() {
         var retval = new XQueryParser.p_IntermediateClause_return();
@@ -26371,7 +26374,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:592:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
+            // xquery/XQueryParser.g:594:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
             var alt49=5;
             switch ( this.input.LA(1) ) {
             case FOR:
@@ -26401,7 +26404,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt49) {
                 case 1 :
-                    // xquery/XQueryParser.g:592:11: p_InitialClause
+                    // xquery/XQueryParser.g:594:11: p_InitialClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_IntermediateClause3774);
@@ -26414,7 +26417,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:592:29: p_WhereClause
+                    // xquery/XQueryParser.g:594:29: p_WhereClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WhereClause_in_p_IntermediateClause3778);
@@ -26427,7 +26430,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:592:45: p_GroupByClause
+                    // xquery/XQueryParser.g:594:45: p_GroupByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_GroupByClause_in_p_IntermediateClause3782);
@@ -26440,7 +26443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:592:63: p_OrderByClause
+                    // xquery/XQueryParser.g:594:63: p_OrderByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_OrderByClause_in_p_IntermediateClause3786);
@@ -26453,7 +26456,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:592:81: p_CountClause
+                    // xquery/XQueryParser.g:594:81: p_CountClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_CountClause_in_p_IntermediateClause3790);
@@ -26500,7 +26503,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:596:1: p_StringConcatExpr : p_RangeExpr ( CONCAT p_RangeExpr )* ;
+    // xquery/XQueryParser.g:598:1: p_StringConcatExpr : p_RangeExpr (o= CONCAT p_RangeExpr )* ;
     // $ANTLR start "p_StringConcatExpr"
     p_StringConcatExpr: function() {
         var retval = new XQueryParser.p_StringConcatExpr_return();
@@ -26508,15 +26511,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CONCAT110 = null;
+        var o = null;
          var p_RangeExpr109 = null;
-         var p_RangeExpr111 = null;
+         var p_RangeExpr110 = null;
 
-        var CONCAT110_tree=null;
+        var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:597:4: ( p_RangeExpr ( CONCAT p_RangeExpr )* )
-            // xquery/XQueryParser.g:597:6: p_RangeExpr ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:4: ( p_RangeExpr (o= CONCAT p_RangeExpr )* )
+            // xquery/XQueryParser.g:599:6: p_RangeExpr (o= CONCAT p_RangeExpr )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811);
@@ -26525,7 +26528,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr109.getTree());
-            // xquery/XQueryParser.g:597:18: ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:18: (o= CONCAT p_RangeExpr )*
             loop50:
             do {
                 var alt50=2;
@@ -26538,18 +26541,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt50) {
                 case 1 :
-                    // xquery/XQueryParser.g:597:20: CONCAT p_RangeExpr
-                    CONCAT110=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3815); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:599:20: o= CONCAT p_RangeExpr
+                    o=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3817); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CONCAT110_tree = this.adaptor.create(CONCAT110);
-                    this.adaptor.addChild(root_0, CONCAT110_tree);
+                    o_tree = this.adaptor.create(o);
+                    this.adaptor.addChild(root_0, o_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817);
-                    p_RangeExpr111=this.p_RangeExpr();
+                    if ( this.state.backtracking===0 ) {
+                       this.ao(o); 
+                    }
+                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821);
+                    p_RangeExpr110=this.p_RangeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr111.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr110.getTree());
 
 
                     break;
@@ -26595,7 +26601,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:602:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
+    // xquery/XQueryParser.g:604:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
     // $ANTLR start "p_ForClause"
     p_ForClause: function() {
         var retval = new XQueryParser.p_ForClause_return();
@@ -26604,19 +26610,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA113 = null;
-         var p_ForBinding112 = null;
-         var p_ForBinding114 = null;
+        var COMMA112 = null;
+         var p_ForBinding111 = null;
+         var p_ForBinding113 = null;
 
         var k_tree=null;
-        var COMMA113_tree=null;
+        var COMMA112_tree=null;
 
         try {
-            // xquery/XQueryParser.g:603:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
-            // xquery/XQueryParser.g:603:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
+            // xquery/XQueryParser.g:605:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
+            // xquery/XQueryParser.g:605:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3844); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3848); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26624,13 +26630,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3848);
-            p_ForBinding112=this.p_ForBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3852);
+            p_ForBinding111=this.p_ForBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding112.getTree());
-            // xquery/XQueryParser.g:603:45: ( COMMA p_ForBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding111.getTree());
+            // xquery/XQueryParser.g:605:45: ( COMMA p_ForBinding )*
             loop51:
             do {
                 var alt51=2;
@@ -26643,18 +26649,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt51) {
                 case 1 :
-                    // xquery/XQueryParser.g:603:46: COMMA p_ForBinding
-                    COMMA113=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3851); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:605:46: COMMA p_ForBinding
+                    COMMA112=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3855); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA113_tree = this.adaptor.create(COMMA113);
-                    this.adaptor.addChild(root_0, COMMA113_tree);
+                    COMMA112_tree = this.adaptor.create(COMMA112);
+                    this.adaptor.addChild(root_0, COMMA112_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3853);
-                    p_ForBinding114=this.p_ForBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3857);
+                    p_ForBinding113=this.p_ForBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding114.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding113.getTree());
 
 
                     break;
@@ -26700,7 +26706,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:607:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:609:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
     // $ANTLR start "p_ForBinding"
     p_ForBinding: function() {
         var retval = new XQueryParser.p_ForBinding_return();
@@ -26711,26 +26717,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var s = null;
         var k = null;
          var v = null;
-         var p_TypeDeclaration115 = null;
-         var p_AllowingEmpty116 = null;
-         var p_PositionalVar117 = null;
-         var p_FTScoreVar118 = null;
-         var p_ExprSingle119 = null;
+         var p_TypeDeclaration114 = null;
+         var p_AllowingEmpty115 = null;
+         var p_PositionalVar116 = null;
+         var p_FTScoreVar117 = null;
+         var p_ExprSingle118 = null;
 
         var s_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:608:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:608:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
+            // xquery/XQueryParser.g:610:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:610:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3883); if (this.state.failed) return retval;
+            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3887); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             s_tree = this.adaptor.create(s);
             this.adaptor.addChild(root_0, s_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3887);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3891);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -26739,7 +26745,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(s, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:608:58: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:610:58: ( p_TypeDeclaration )?
             var alt52=2;
             var LA52_0 = this.input.LA(1);
 
@@ -26748,20 +26754,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt52) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:58: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3891);
-                    p_TypeDeclaration115=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:610:58: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3895);
+                    p_TypeDeclaration114=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration115.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration114.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:77: ( p_AllowingEmpty )?
+            // xquery/XQueryParser.g:610:77: ( p_AllowingEmpty )?
             var alt53=2;
             var LA53_0 = this.input.LA(1);
 
@@ -26770,20 +26776,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt53) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:77: p_AllowingEmpty
-                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3894);
-                    p_AllowingEmpty116=this.p_AllowingEmpty();
+                    // xquery/XQueryParser.g:610:77: p_AllowingEmpty
+                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3898);
+                    p_AllowingEmpty115=this.p_AllowingEmpty();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty116.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty115.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:94: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:610:94: ( p_PositionalVar )?
             var alt54=2;
             var LA54_0 = this.input.LA(1);
 
@@ -26792,20 +26798,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt54) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:94: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3897);
-                    p_PositionalVar117=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:610:94: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3901);
+                    p_PositionalVar116=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar117.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar116.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:111: ( p_FTScoreVar )?
+            // xquery/XQueryParser.g:610:111: ( p_FTScoreVar )?
             var alt55=2;
             var LA55_0 = this.input.LA(1);
 
@@ -26814,20 +26820,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt55) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:111: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3900);
-                    p_FTScoreVar118=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:610:111: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3904);
+                    p_FTScoreVar117=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar118.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar117.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3905); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3909); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26835,12 +26841,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3909);
-            p_ExprSingle119=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3913);
+            p_ExprSingle118=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle119.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle118.getTree());
 
 
 
@@ -26877,7 +26883,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:612:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
+    // xquery/XQueryParser.g:614:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
     // $ANTLR start "p_AllowingEmpty"
     p_AllowingEmpty: function() {
         var retval = new XQueryParser.p_AllowingEmpty_return();
@@ -26890,11 +26896,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:613:9: (k= ALLOWING k= EMPTY )
-            // xquery/XQueryParser.g:613:11: k= ALLOWING k= EMPTY
+            // xquery/XQueryParser.g:615:9: (k= ALLOWING k= EMPTY )
+            // xquery/XQueryParser.g:615:11: k= ALLOWING k= EMPTY
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3938); if (this.state.failed) return retval;
+            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3942); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26902,7 +26908,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3944); if (this.state.failed) return retval;
+            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3948); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26946,7 +26952,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:617:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:619:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_PositionalVar"
     p_PositionalVar: function() {
         var retval = new XQueryParser.p_PositionalVar_return();
@@ -26962,11 +26968,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:618:9: (k= AT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:618:11: k= AT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:620:9: (k= AT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:620:11: k= AT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3974); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3978); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26974,12 +26980,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3980); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3984); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3984);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3988);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27024,7 +27030,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:622:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
+    // xquery/XQueryParser.g:624:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
     // $ANTLR start "p_LetClause"
     p_LetClause: function() {
         var retval = new XQueryParser.p_LetClause_return();
@@ -27033,19 +27039,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA121 = null;
-         var p_LetBinding120 = null;
-         var p_LetBinding122 = null;
+        var COMMA120 = null;
+         var p_LetBinding119 = null;
+         var p_LetBinding121 = null;
 
         var k_tree=null;
-        var COMMA121_tree=null;
+        var COMMA120_tree=null;
 
         try {
-            // xquery/XQueryParser.g:623:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
-            // xquery/XQueryParser.g:623:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
+            // xquery/XQueryParser.g:625:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
+            // xquery/XQueryParser.g:625:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4014); if (this.state.failed) return retval;
+            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4018); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27053,13 +27059,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4018);
-            p_LetBinding120=this.p_LetBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4022);
+            p_LetBinding119=this.p_LetBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding120.getTree());
-            // xquery/XQueryParser.g:623:45: ( COMMA p_LetBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding119.getTree());
+            // xquery/XQueryParser.g:625:45: ( COMMA p_LetBinding )*
             loop56:
             do {
                 var alt56=2;
@@ -27072,18 +27078,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt56) {
                 case 1 :
-                    // xquery/XQueryParser.g:623:46: COMMA p_LetBinding
-                    COMMA121=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4021); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:625:46: COMMA p_LetBinding
+                    COMMA120=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4025); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA121_tree = this.adaptor.create(COMMA121);
-                    this.adaptor.addChild(root_0, COMMA121_tree);
+                    COMMA120_tree = this.adaptor.create(COMMA120);
+                    this.adaptor.addChild(root_0, COMMA120_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4023);
-                    p_LetBinding122=this.p_LetBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4027);
+                    p_LetBinding121=this.p_LetBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding122.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding121.getTree());
 
 
                     break;
@@ -27129,7 +27135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:628:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:630:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
     // $ANTLR start "p_LetBinding"
     p_LetBinding: function() {
         var retval = new XQueryParser.p_LetBinding_return();
@@ -27138,21 +27144,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND125 = null;
+        var BIND124 = null;
          var v = null;
-         var p_TypeDeclaration123 = null;
-         var p_FTScoreVar124 = null;
-         var p_ExprSingle126 = null;
+         var p_TypeDeclaration122 = null;
+         var p_FTScoreVar123 = null;
+         var p_ExprSingle125 = null;
 
         var d_tree=null;
-        var BIND125_tree=null;
+        var BIND124_tree=null;
 
         try {
-            // xquery/XQueryParser.g:629:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
+            // xquery/XQueryParser.g:631:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
             var alt58=2;
             var LA58_0 = this.input.LA(1);
 
@@ -27171,15 +27177,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt58) {
                 case 1 :
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4057); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4061); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4061);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4065);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -27188,7 +27194,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(d, (v?v.stop:null));
                     }
-                    // xquery/XQueryParser.g:629:59: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:631:59: ( p_TypeDeclaration )?
                     var alt57=2;
                     var LA57_0 = this.input.LA(1);
 
@@ -27197,13 +27203,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt57) {
                         case 1 :
-                            // xquery/XQueryParser.g:629:59: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4065);
-                            p_TypeDeclaration123=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:631:59: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4069);
+                            p_TypeDeclaration122=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration123.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration122.getTree());
 
 
                             break;
@@ -27217,30 +27223,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:629:81: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4071);
-                    p_FTScoreVar124=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:631:81: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4075);
+                    p_FTScoreVar123=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar124.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar123.getTree());
 
 
                     break;
 
             }
 
-            BIND125=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4075); if (this.state.failed) return retval;
+            BIND124=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4079); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND125_tree = this.adaptor.create(BIND125);
-            this.adaptor.addChild(root_0, BIND125_tree);
+            BIND124_tree = this.adaptor.create(BIND124);
+            this.adaptor.addChild(root_0, BIND124_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4077);
-            p_ExprSingle126=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4081);
+            p_ExprSingle125=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle126.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle125.getTree());
 
 
 
@@ -27277,7 +27283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:633:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
+    // xquery/XQueryParser.g:635:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
     // $ANTLR start "p_WindowClause"
     p_WindowClause: function() {
         var retval = new XQueryParser.p_WindowClause_return();
@@ -27286,17 +27292,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TumblingWindowClause127 = null;
-         var p_SlidingWindowClause128 = null;
+         var p_TumblingWindowClause126 = null;
+         var p_SlidingWindowClause127 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:634:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
-            // xquery/XQueryParser.g:634:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
+            // xquery/XQueryParser.g:636:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4106); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4110); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27304,7 +27310,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:634:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
             var alt59=2;
             var LA59_0 = this.input.LA(1);
 
@@ -27323,24 +27329,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt59) {
                 case 1 :
-                    // xquery/XQueryParser.g:634:33: p_TumblingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111);
-                    p_TumblingWindowClause127=this.p_TumblingWindowClause();
+                    // xquery/XQueryParser.g:636:33: p_TumblingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115);
+                    p_TumblingWindowClause126=this.p_TumblingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause127.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause126.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:634:58: p_SlidingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115);
-                    p_SlidingWindowClause128=this.p_SlidingWindowClause();
+                    // xquery/XQueryParser.g:636:58: p_SlidingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119);
+                    p_SlidingWindowClause127=this.p_SlidingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause128.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause127.getTree());
 
 
                     break;
@@ -27383,7 +27389,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:638:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:640:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_TumblingWindowClause"
     p_TumblingWindowClause: function() {
         var retval = new XQueryParser.p_TumblingWindowClause_return();
@@ -27394,20 +27400,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration129 = null;
-         var p_ExprSingle130 = null;
-         var p_WindowStartCondition131 = null;
-         var p_WindowEndCondition132 = null;
+         var p_TypeDeclaration128 = null;
+         var p_ExprSingle129 = null;
+         var p_WindowStartCondition130 = null;
+         var p_WindowEndCondition131 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:639:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:639:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:641:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:641:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4152); if (this.state.failed) return retval;
+            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4156); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27415,7 +27421,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4158); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4162); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27423,12 +27429,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4164); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4168);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4172);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27437,7 +27443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.av(d, (v?v.stop:null));
             }
-            // xquery/XQueryParser.g:639:106: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:641:106: ( p_TypeDeclaration )?
             var alt60=2;
             var LA60_0 = this.input.LA(1);
 
@@ -27446,20 +27452,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt60) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:106: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172);
-                    p_TypeDeclaration129=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:641:106: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176);
+                    p_TypeDeclaration128=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration129.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration128.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4177); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27467,19 +27473,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181);
-            p_ExprSingle130=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185);
+            p_ExprSingle129=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle130.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184);
-            p_WindowStartCondition131=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle129.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188);
+            p_WindowStartCondition130=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition131.getTree());
-            // xquery/XQueryParser.g:639:187: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition130.getTree());
+            // xquery/XQueryParser.g:641:187: ( p_WindowEndCondition )?
             var alt61=2;
             var LA61_0 = this.input.LA(1);
 
@@ -27488,13 +27494,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt61) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:187: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186);
-                    p_WindowEndCondition132=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:641:187: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190);
+                    p_WindowEndCondition131=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition132.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition131.getTree());
 
 
                     break;
@@ -27537,7 +27543,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:643:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:645:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_SlidingWindowClause"
     p_SlidingWindowClause: function() {
         var retval = new XQueryParser.p_SlidingWindowClause_return();
@@ -27548,20 +27554,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration133 = null;
-         var p_ExprSingle134 = null;
-         var p_WindowStartCondition135 = null;
-         var p_WindowEndCondition136 = null;
+         var p_TypeDeclaration132 = null;
+         var p_ExprSingle133 = null;
+         var p_WindowStartCondition134 = null;
+         var p_WindowEndCondition135 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:644:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:644:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:646:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:646:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4215); if (this.state.failed) return retval;
+            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4219); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27569,7 +27575,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4221); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4225); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27577,12 +27583,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4227); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4231); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4231);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4235);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27591,7 +27597,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:644:107: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:646:107: ( p_TypeDeclaration )?
             var alt62=2;
             var LA62_0 = this.input.LA(1);
 
@@ -27600,20 +27606,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt62) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:107: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235);
-                    p_TypeDeclaration133=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:646:107: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239);
+                    p_TypeDeclaration132=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration133.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration132.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4240); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27621,19 +27627,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244);
-            p_ExprSingle134=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248);
+            p_ExprSingle133=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle134.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247);
-            p_WindowStartCondition135=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle133.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251);
+            p_WindowStartCondition134=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition135.getTree());
-            // xquery/XQueryParser.g:644:188: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition134.getTree());
+            // xquery/XQueryParser.g:646:188: ( p_WindowEndCondition )?
             var alt63=2;
             var LA63_0 = this.input.LA(1);
 
@@ -27642,13 +27648,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt63) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:188: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249);
-                    p_WindowEndCondition136=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:646:188: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253);
+                    p_WindowEndCondition135=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition136.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition135.getTree());
 
 
                     break;
@@ -27691,7 +27697,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:648:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:650:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowStartCondition"
     p_WindowStartCondition: function() {
         var retval = new XQueryParser.p_WindowStartCondition_return();
@@ -27700,17 +27706,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars137 = null;
-         var p_ExprSingle138 = null;
+         var p_WindowVars136 = null;
+         var p_ExprSingle137 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:649:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:649:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:651:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:651:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4278); if (this.state.failed) return retval;
+            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4282); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27718,13 +27724,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4282);
-            p_WindowVars137=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4286);
+            p_WindowVars136=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars137.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4286); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars136.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4290); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27732,12 +27738,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290);
-            p_ExprSingle138=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294);
+            p_ExprSingle137=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle138.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle137.getTree());
 
 
 
@@ -27774,7 +27780,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:653:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:655:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowEndCondition"
     p_WindowEndCondition: function() {
         var retval = new XQueryParser.p_WindowEndCondition_return();
@@ -27783,17 +27789,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars139 = null;
-         var p_ExprSingle140 = null;
+         var p_WindowVars138 = null;
+         var p_ExprSingle139 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:654:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:654:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:656:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:656:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:654:11: (k= ONLY )?
+            // xquery/XQueryParser.g:656:11: (k= ONLY )?
             var alt64=2;
             var LA64_0 = this.input.LA(1);
 
@@ -27802,8 +27808,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt64) {
                 case 1 :
-                    // xquery/XQueryParser.g:654:12: k= ONLY
-                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4320); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:656:12: k= ONLY
+                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4324); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27817,7 +27823,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4328); if (this.state.failed) return retval;
+            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27825,13 +27831,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4332);
-            p_WindowVars139=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4336);
+            p_WindowVars138=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars139.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4336); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars138.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4340); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27839,12 +27845,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340);
-            p_ExprSingle140=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344);
+            p_ExprSingle139=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle140.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle139.getTree());
 
 
 
@@ -27881,7 +27887,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:658:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
+    // xquery/XQueryParser.g:660:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
     // $ANTLR start "p_WindowVars"
     p_WindowVars: function() {
         var retval = new XQueryParser.p_WindowVars_return();
@@ -27891,24 +27897,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var k = null;
-        var DOLLAR142 = null;
-        var DOLLAR144 = null;
+        var DOLLAR141 = null;
+        var DOLLAR143 = null;
          var v = null;
-         var p_PositionalVar141 = null;
-         var p_PreviousItem143 = null;
-         var p_NextItem145 = null;
+         var p_PositionalVar140 = null;
+         var p_PreviousItem142 = null;
+         var p_NextItem144 = null;
 
         var d_tree=null;
         var k_tree=null;
-        var DOLLAR142_tree=null;
-        var DOLLAR144_tree=null;
+        var DOLLAR141_tree=null;
+        var DOLLAR143_tree=null;
 
         try {
-            // xquery/XQueryParser.g:659:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )?
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )?
             var alt65=2;
             var LA65_0 = this.input.LA(1);
 
@@ -27917,13 +27923,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt65) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:12: d= DOLLAR v= p_CurrentItem
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4370); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:12: d= DOLLAR v= p_CurrentItem
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4374);
+                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4378);
                     v=this.p_CurrentItem();
 
                     this.state._fsp--;
@@ -27938,7 +27944,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:659:65: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:661:65: ( p_PositionalVar )?
             var alt66=2;
             var LA66_0 = this.input.LA(1);
 
@@ -27947,20 +27953,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt66) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:65: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4380);
-                    p_PositionalVar141=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:661:65: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4384);
+                    p_PositionalVar140=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar141.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar140.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
+            // xquery/XQueryParser.g:661:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
             var alt67=2;
             var LA67_0 = this.input.LA(1);
 
@@ -27969,8 +27975,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt67) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:83: k= PREVIOUS DOLLAR p_PreviousItem
-                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4386); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:83: k= PREVIOUS DOLLAR p_PreviousItem
+                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4390); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27978,24 +27984,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR142=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4390); if (this.state.failed) return retval;
+                    DOLLAR141=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4394); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR142_tree = this.adaptor.create(DOLLAR142);
-                    this.adaptor.addChild(root_0, DOLLAR142_tree);
+                    DOLLAR141_tree = this.adaptor.create(DOLLAR141);
+                    this.adaptor.addChild(root_0, DOLLAR141_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4392);
-                    p_PreviousItem143=this.p_PreviousItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4396);
+                    p_PreviousItem142=this.p_PreviousItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem143.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem142.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:133: (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:133: (k= NEXT DOLLAR p_NextItem )?
             var alt68=2;
             var LA68_0 = this.input.LA(1);
 
@@ -28004,8 +28010,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt68) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:134: k= NEXT DOLLAR p_NextItem
-                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4399); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:134: k= NEXT DOLLAR p_NextItem
+                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4403); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28013,17 +28019,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR144=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4403); if (this.state.failed) return retval;
+                    DOLLAR143=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4407); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR144_tree = this.adaptor.create(DOLLAR144);
-                    this.adaptor.addChild(root_0, DOLLAR144_tree);
+                    DOLLAR143_tree = this.adaptor.create(DOLLAR143);
+                    this.adaptor.addChild(root_0, DOLLAR143_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4405);
-                    p_NextItem145=this.p_NextItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4409);
+                    p_NextItem144=this.p_NextItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem145.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem144.getTree());
 
 
                     break;
@@ -28066,7 +28072,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:663:1: p_CurrentItem : p_QName ;
+    // xquery/XQueryParser.g:665:1: p_CurrentItem : p_QName ;
     // $ANTLR start "p_CurrentItem"
     p_CurrentItem: function() {
         var retval = new XQueryParser.p_CurrentItem_return();
@@ -28074,20 +28080,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName146 = null;
+         var p_QName145 = null;
 
 
         try {
-            // xquery/XQueryParser.g:664:9: ( p_QName )
-            // xquery/XQueryParser.g:664:11: p_QName
+            // xquery/XQueryParser.g:666:9: ( p_QName )
+            // xquery/XQueryParser.g:666:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4433);
-            p_QName146=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4437);
+            p_QName145=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName145.getTree());
 
 
 
@@ -28124,7 +28130,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:668:1: p_PreviousItem : p_QName ;
+    // xquery/XQueryParser.g:670:1: p_PreviousItem : p_QName ;
     // $ANTLR start "p_PreviousItem"
     p_PreviousItem: function() {
         var retval = new XQueryParser.p_PreviousItem_return();
@@ -28132,20 +28138,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName147 = null;
+         var p_QName146 = null;
 
 
         try {
-            // xquery/XQueryParser.g:669:9: ( p_QName )
-            // xquery/XQueryParser.g:669:11: p_QName
+            // xquery/XQueryParser.g:671:9: ( p_QName )
+            // xquery/XQueryParser.g:671:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4459);
-            p_QName147=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4463);
+            p_QName146=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
 
 
 
@@ -28182,7 +28188,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:673:1: p_NextItem : p_QName ;
+    // xquery/XQueryParser.g:675:1: p_NextItem : p_QName ;
     // $ANTLR start "p_NextItem"
     p_NextItem: function() {
         var retval = new XQueryParser.p_NextItem_return();
@@ -28190,20 +28196,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName148 = null;
+         var p_QName147 = null;
 
 
         try {
-            // xquery/XQueryParser.g:674:9: ( p_QName )
-            // xquery/XQueryParser.g:674:11: p_QName
+            // xquery/XQueryParser.g:676:9: ( p_QName )
+            // xquery/XQueryParser.g:676:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4485);
-            p_QName148=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4489);
+            p_QName147=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName148.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
 
 
 
@@ -28240,7 +28246,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:678:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:680:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_CountClause"
     p_CountClause: function() {
         var retval = new XQueryParser.p_CountClause_return();
@@ -28256,11 +28262,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:679:9: (k= COUNT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:679:11: k= COUNT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:681:9: (k= COUNT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:681:11: k= COUNT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4513); if (this.state.failed) return retval;
+            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4517); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28268,12 +28274,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4519); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4523); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4523);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4527);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -28318,7 +28324,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:683:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:685:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
     // $ANTLR start "p_WhereClause"
     p_WhereClause: function() {
         var retval = new XQueryParser.p_WhereClause_return();
@@ -28327,16 +28333,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ExprSingle149 = null;
+         var p_ExprSingle148 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:684:9: (k= WHERE p_ExprSingle[true] )
-            // xquery/XQueryParser.g:684:11: k= WHERE p_ExprSingle[true]
+            // xquery/XQueryParser.g:686:9: (k= WHERE p_ExprSingle[true] )
+            // xquery/XQueryParser.g:686:11: k= WHERE p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4561); if (this.state.failed) return retval;
+            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4565); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28344,12 +28350,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4565);
-            p_ExprSingle149=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4569);
+            p_ExprSingle148=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle149.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle148.getTree());
 
 
 
@@ -28386,7 +28392,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:688:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
+    // xquery/XQueryParser.g:690:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
     // $ANTLR start "p_GroupByClause"
     p_GroupByClause: function() {
         var retval = new XQueryParser.p_GroupByClause_return();
@@ -28395,16 +28401,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_GroupingSpecList150 = null;
+         var p_GroupingSpecList149 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:689:9: (k= GROUP k= BY p_GroupingSpecList )
-            // xquery/XQueryParser.g:689:11: k= GROUP k= BY p_GroupingSpecList
+            // xquery/XQueryParser.g:691:9: (k= GROUP k= BY p_GroupingSpecList )
+            // xquery/XQueryParser.g:691:11: k= GROUP k= BY p_GroupingSpecList
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4594); if (this.state.failed) return retval;
+            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4598); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28412,7 +28418,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4600); if (this.state.failed) return retval;
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4604); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28420,12 +28426,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604);
-            p_GroupingSpecList150=this.p_GroupingSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608);
+            p_GroupingSpecList149=this.p_GroupingSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList150.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList149.getTree());
 
 
 
@@ -28462,7 +28468,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:693:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
+    // xquery/XQueryParser.g:695:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
     // $ANTLR start "p_GroupingSpecList"
     p_GroupingSpecList: function() {
         var retval = new XQueryParser.p_GroupingSpecList_return();
@@ -28470,24 +28476,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA152 = null;
-         var p_GroupingSpec151 = null;
-         var p_GroupingSpec153 = null;
+        var COMMA151 = null;
+         var p_GroupingSpec150 = null;
+         var p_GroupingSpec152 = null;
 
-        var COMMA152_tree=null;
+        var COMMA151_tree=null;
 
         try {
-            // xquery/XQueryParser.g:694:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
-            // xquery/XQueryParser.g:694:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
+            // xquery/XQueryParser.g:696:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
+            // xquery/XQueryParser.g:696:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630);
-            p_GroupingSpec151=this.p_GroupingSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634);
+            p_GroupingSpec150=this.p_GroupingSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec151.getTree());
-            // xquery/XQueryParser.g:694:26: ( COMMA p_GroupingSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec150.getTree());
+            // xquery/XQueryParser.g:696:26: ( COMMA p_GroupingSpec )*
             loop69:
             do {
                 var alt69=2;
@@ -28500,18 +28506,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt69) {
                 case 1 :
-                    // xquery/XQueryParser.g:694:27: COMMA p_GroupingSpec
-                    COMMA152=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4633); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:696:27: COMMA p_GroupingSpec
+                    COMMA151=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4637); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA152_tree = this.adaptor.create(COMMA152);
-                    this.adaptor.addChild(root_0, COMMA152_tree);
+                    COMMA151_tree = this.adaptor.create(COMMA151);
+                    this.adaptor.addChild(root_0, COMMA151_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635);
-                    p_GroupingSpec153=this.p_GroupingSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639);
+                    p_GroupingSpec152=this.p_GroupingSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec153.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec152.getTree());
 
 
                     break;
@@ -28557,7 +28563,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:698:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:700:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_GroupingSpec"
     p_GroupingSpec: function() {
         var retval = new XQueryParser.p_GroupingSpec_return();
@@ -28568,22 +28574,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_StringLiteral154 = null;
+         var p_StringLiteral153 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:699:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:699:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:701:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4665); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4669); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4669);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4673);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -28592,7 +28598,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:699:58: (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:58: (k= COLLATION p_StringLiteral )?
             var alt70=2;
             var LA70_0 = this.input.LA(1);
 
@@ -28601,8 +28607,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt70) {
                 case 1 :
-                    // xquery/XQueryParser.g:699:59: k= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4676); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:701:59: k= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4680); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28610,12 +28616,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4680);
-                    p_StringLiteral154=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4684);
+                    p_StringLiteral153=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral154.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral153.getTree());
 
 
                     break;
@@ -28658,7 +28664,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:703:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
+    // xquery/XQueryParser.g:705:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
     // $ANTLR start "p_OrderByClause"
     p_OrderByClause: function() {
         var retval = new XQueryParser.p_OrderByClause_return();
@@ -28668,16 +28674,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_OrderSpecList155 = null;
+         var p_OrderSpecList154 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:704:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
+            // xquery/XQueryParser.g:706:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
             var alt71=2;
             var LA71_0 = this.input.LA(1);
 
@@ -28696,10 +28702,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt71) {
                 case 1 :
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:13: k+= ORDER k+= BY
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4712); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:13: k+= ORDER k+= BY
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4716); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28707,7 +28713,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4716); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28722,10 +28728,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:32: k+= STABLE k+= ORDER k+= BY
-                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4724); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:32: k+= STABLE k+= ORDER k+= BY
+                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4728); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28733,7 +28739,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4728); if (this.state.failed) return retval;
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4732); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28741,7 +28747,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4732); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4736); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28761,12 +28767,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4738);
-            p_OrderSpecList155=this.p_OrderSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4742);
+            p_OrderSpecList154=this.p_OrderSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList155.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList154.getTree());
 
 
 
@@ -28803,7 +28809,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:708:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
+    // xquery/XQueryParser.g:710:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
     // $ANTLR start "p_OrderSpecList"
     p_OrderSpecList: function() {
         var retval = new XQueryParser.p_OrderSpecList_return();
@@ -28811,24 +28817,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA157 = null;
-         var p_OrderSpec156 = null;
-         var p_OrderSpec158 = null;
+        var COMMA156 = null;
+         var p_OrderSpec155 = null;
+         var p_OrderSpec157 = null;
 
-        var COMMA157_tree=null;
+        var COMMA156_tree=null;
 
         try {
-            // xquery/XQueryParser.g:709:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
-            // xquery/XQueryParser.g:709:11: p_OrderSpec ( COMMA p_OrderSpec )*
+            // xquery/XQueryParser.g:711:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
+            // xquery/XQueryParser.g:711:11: p_OrderSpec ( COMMA p_OrderSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4764);
-            p_OrderSpec156=this.p_OrderSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4768);
+            p_OrderSpec155=this.p_OrderSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec156.getTree());
-            // xquery/XQueryParser.g:709:23: ( COMMA p_OrderSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec155.getTree());
+            // xquery/XQueryParser.g:711:23: ( COMMA p_OrderSpec )*
             loop72:
             do {
                 var alt72=2;
@@ -28841,18 +28847,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt72) {
                 case 1 :
-                    // xquery/XQueryParser.g:709:24: COMMA p_OrderSpec
-                    COMMA157=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4767); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:711:24: COMMA p_OrderSpec
+                    COMMA156=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4771); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA157_tree = this.adaptor.create(COMMA157);
-                    this.adaptor.addChild(root_0, COMMA157_tree);
+                    COMMA156_tree = this.adaptor.create(COMMA156);
+                    this.adaptor.addChild(root_0, COMMA156_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4769);
-                    p_OrderSpec158=this.p_OrderSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4773);
+                    p_OrderSpec157=this.p_OrderSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec158.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec157.getTree());
 
 
                     break;
@@ -28898,7 +28904,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:713:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
+    // xquery/XQueryParser.g:715:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
     // $ANTLR start "p_OrderSpec"
     p_OrderSpec: function() {
         var retval = new XQueryParser.p_OrderSpec_return();
@@ -28906,27 +28912,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle159 = null;
-         var p_OrderModifier160 = null;
+         var p_ExprSingle158 = null;
+         var p_OrderModifier159 = null;
 
 
         try {
-            // xquery/XQueryParser.g:714:9: ( p_ExprSingle[true] p_OrderModifier )
-            // xquery/XQueryParser.g:714:11: p_ExprSingle[true] p_OrderModifier
+            // xquery/XQueryParser.g:716:9: ( p_ExprSingle[true] p_OrderModifier )
+            // xquery/XQueryParser.g:716:11: p_ExprSingle[true] p_OrderModifier
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4797);
-            p_ExprSingle159=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4801);
+            p_ExprSingle158=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle159.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4800);
-            p_OrderModifier160=this.p_OrderModifier();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle158.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4804);
+            p_OrderModifier159=this.p_OrderModifier();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier160.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier159.getTree());
 
 
 
@@ -28963,7 +28969,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:718:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:720:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_OrderModifier"
     p_OrderModifier: function() {
         var retval = new XQueryParser.p_OrderModifier_return();
@@ -28973,16 +28979,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral161 = null;
+         var p_StringLiteral160 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:719:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )?
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )?
             var alt73=3;
             var LA73_0 = this.input.LA(1);
 
@@ -28994,8 +29000,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt73) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:12: k+= ASCENDING
-                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4829); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:12: k+= ASCENDING
+                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4833); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29007,8 +29013,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:719:27: k+= DESCENDING
-                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4835); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:27: k+= DESCENDING
+                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4839); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29022,7 +29028,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
+            // xquery/XQueryParser.g:721:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
             var alt75=2;
             var LA75_0 = this.input.LA(1);
 
@@ -29031,8 +29037,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt75) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
-                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4842); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
+                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4846); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29040,7 +29046,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:719:53: (k+= GREATEST | k+= LEAST )
+                    // xquery/XQueryParser.g:721:53: (k+= GREATEST | k+= LEAST )
                     var alt74=2;
                     var LA74_0 = this.input.LA(1);
 
@@ -29059,8 +29065,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt74) {
                         case 1 :
-                            // xquery/XQueryParser.g:719:54: k+= GREATEST
-                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4847); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:54: k+= GREATEST
+                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4851); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29072,8 +29078,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:719:68: k+= LEAST
-                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4853); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:68: k+= LEAST
+                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4857); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29093,7 +29099,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:80: (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:80: (k+= COLLATION p_StringLiteral )?
             var alt76=2;
             var LA76_0 = this.input.LA(1);
 
@@ -29102,8 +29108,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt76) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:81: k+= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4861); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:81: k+= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29111,12 +29117,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4863);
-                    p_StringLiteral161=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4867);
+                    p_StringLiteral160=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral161.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral160.getTree());
 
 
                     break;
@@ -29162,7 +29168,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:723:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:725:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_ReturnHybrid"
     p_ReturnHybrid: function(strict) {
         var retval = new XQueryParser.p_ReturnHybrid_return();
@@ -29171,16 +29177,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid162 = null;
+         var p_Hybrid161 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:724:9: (k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:724:11: k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:726:9: (k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:726:11: k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4896); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29188,12 +29194,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4900);
-            p_Hybrid162=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4904);
+            p_Hybrid161=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid162.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid161.getTree());
 
 
 
@@ -29230,7 +29236,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:728:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:730:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
     // $ANTLR start "p_QuantifiedExpr"
     p_QuantifiedExpr: function() {
         var retval = new XQueryParser.p_QuantifiedExpr_return();
@@ -29241,26 +29247,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var COMMA165 = null;
+        var COMMA164 = null;
          var v = null;
          var w = null;
-         var p_TypeDeclaration163 = null;
-         var p_ExprSingle164 = null;
-         var p_TypeDeclaration166 = null;
+         var p_TypeDeclaration162 = null;
+         var p_ExprSingle163 = null;
+         var p_TypeDeclaration165 = null;
+         var p_ExprSingle166 = null;
          var p_ExprSingle167 = null;
-         var p_ExprSingle168 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var COMMA165_tree=null;
+        var COMMA164_tree=null;
 
         try {
-            // xquery/XQueryParser.g:729:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
+            // xquery/XQueryParser.g:731:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY )
             var alt77=2;
             var LA77_0 = this.input.LA(1);
 
@@ -29279,8 +29285,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt77) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:12: k= SOME
-                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4930); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:12: k= SOME
+                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4934); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29289,8 +29295,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:729:21: k= EVERY
-                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4936); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:21: k= EVERY
+                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4940); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29304,12 +29310,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4943); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4947); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4947);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4951);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -29318,7 +29324,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:729:92: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:731:92: ( p_TypeDeclaration )?
             var alt78=2;
             var LA78_0 = this.input.LA(1);
 
@@ -29327,20 +29333,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt78) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:92: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951);
-                    p_TypeDeclaration163=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:731:92: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955);
+                    p_TypeDeclaration162=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration163.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration162.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4956); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4960); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29348,13 +29354,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960);
-            p_ExprSingle164=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964);
+            p_ExprSingle163=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle164.getTree());
-            // xquery/XQueryParser.g:729:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle163.getTree());
+            // xquery/XQueryParser.g:731:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
             loop80:
             do {
                 var alt80=2;
@@ -29367,18 +29373,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt80) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
-                    COMMA165=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4964); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
+                    COMMA164=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA165_tree = this.adaptor.create(COMMA165);
-                    this.adaptor.addChild(root_0, COMMA165_tree);
+                    COMMA164_tree = this.adaptor.create(COMMA164);
+                    this.adaptor.addChild(root_0, COMMA164_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4972); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4972);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4976);
                     w=this.p_QName();
 
                     this.state._fsp--;
@@ -29387,7 +29393,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(e, (w?w.stop:null));
                     }
-                    // xquery/XQueryParser.g:729:200: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:731:200: ( p_TypeDeclaration )?
                     var alt79=2;
                     var LA79_0 = this.input.LA(1);
 
@@ -29396,20 +29402,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt79) {
                         case 1 :
-                            // xquery/XQueryParser.g:729:200: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976);
-                            p_TypeDeclaration166=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:731:200: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980);
+                            p_TypeDeclaration165=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration166.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration165.getTree());
 
 
                             break;
 
                     }
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4981); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29417,12 +29423,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985);
-                    p_ExprSingle167=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989);
+                    p_ExprSingle166=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle166.getTree());
 
 
                     break;
@@ -29432,7 +29438,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4992); if (this.state.failed) return retval;
+            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4996); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29440,12 +29446,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996);
-            p_ExprSingle168=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000);
+            p_ExprSingle167=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle168.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
 
 
 
@@ -29482,7 +29488,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:733:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:735:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchHybrid"
     p_SwitchHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchHybrid_return();
@@ -29491,22 +29497,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN169 = null;
-        var RPAREN171 = null;
-         var p_Expr170 = null;
-         var p_SwitchCaseHybrid172 = null;
-         var p_Hybrid173 = null;
+        var LPAREN168 = null;
+        var RPAREN170 = null;
+         var p_Expr169 = null;
+         var p_SwitchCaseHybrid171 = null;
+         var p_Hybrid172 = null;
 
         var k_tree=null;
-        var LPAREN169_tree=null;
-        var RPAREN171_tree=null;
+        var LPAREN168_tree=null;
+        var RPAREN170_tree=null;
 
         try {
-            // xquery/XQueryParser.g:734:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:734:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:736:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:736:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5026); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29514,23 +29520,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN169=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
+            LPAREN168=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5034); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN169_tree = this.adaptor.create(LPAREN169);
-            this.adaptor.addChild(root_0, LPAREN169_tree);
+            LPAREN168_tree = this.adaptor.create(LPAREN168);
+            this.adaptor.addChild(root_0, LPAREN168_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5032);
-            p_Expr170=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5036);
+            p_Expr169=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr170.getTree());
-            RPAREN171=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5035); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr169.getTree());
+            RPAREN170=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5039); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN171_tree = this.adaptor.create(RPAREN171);
-            this.adaptor.addChild(root_0, RPAREN171_tree);
+            RPAREN170_tree = this.adaptor.create(RPAREN170);
+            this.adaptor.addChild(root_0, RPAREN170_tree);
             }
-            // xquery/XQueryParser.g:734:67: ( p_SwitchCaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:736:67: ( p_SwitchCaseHybrid[$strict] )+
             var cnt81=0;
             loop81:
             do {
@@ -29544,13 +29550,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt81) {
                 case 1 :
-                    // xquery/XQueryParser.g:734:67: p_SwitchCaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037);
-                    p_SwitchCaseHybrid172=this.p_SwitchCaseHybrid(strict);
+                    // xquery/XQueryParser.g:736:67: p_SwitchCaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041);
+                    p_SwitchCaseHybrid171=this.p_SwitchCaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid172.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid171.getTree());
 
 
                     break;
@@ -29566,7 +29572,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt81++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5043); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5047); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29574,7 +29580,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5049); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5053); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29582,12 +29588,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5053);
-            p_Hybrid173=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5057);
+            p_Hybrid172=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid173.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid172.getTree());
 
 
 
@@ -29624,7 +29630,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:738:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:740:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchCaseHybrid"
     p_SwitchCaseHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchCaseHybrid_return();
@@ -29633,17 +29639,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand174 = null;
-         var p_Hybrid175 = null;
+         var p_SwitchCaseOperand173 = null;
+         var p_Hybrid174 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:739:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:741:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+
             var cnt82=0;
             loop82:
             do {
@@ -29657,8 +29663,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt82) {
                 case 1 :
-                    // xquery/XQueryParser.g:739:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:741:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5088); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29666,12 +29672,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088);
-                    p_SwitchCaseOperand174=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092);
+                    p_SwitchCaseOperand173=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand174.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand173.getTree());
 
 
                     break;
@@ -29687,7 +29693,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt82++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5094); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5098); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29695,12 +29701,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098);
-            p_Hybrid175=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102);
+            p_Hybrid174=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid175.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid174.getTree());
 
 
 
@@ -29737,7 +29743,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:743:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:745:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
     // $ANTLR start "p_SwitchCaseOperand"
     p_SwitchCaseOperand: function() {
         var retval = new XQueryParser.p_SwitchCaseOperand_return();
@@ -29745,20 +29751,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle176 = null;
+         var p_ExprSingle175 = null;
 
 
         try {
-            // xquery/XQueryParser.g:744:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:744:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:746:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:746:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125);
-            p_ExprSingle176=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129);
+            p_ExprSingle175=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle176.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle175.getTree());
 
 
 
@@ -29795,7 +29801,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:748:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:750:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_TypeswitchHybrid"
     p_TypeswitchHybrid: function(strict) {
         var retval = new XQueryParser.p_TypeswitchHybrid_return();
@@ -29805,24 +29811,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN177 = null;
-        var RPAREN179 = null;
+        var LPAREN176 = null;
+        var RPAREN178 = null;
          var v = null;
-         var p_Expr178 = null;
-         var p_CaseHybrid180 = null;
-         var p_Hybrid181 = null;
+         var p_Expr177 = null;
+         var p_CaseHybrid179 = null;
+         var p_Hybrid180 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN177_tree=null;
-        var RPAREN179_tree=null;
+        var LPAREN176_tree=null;
+        var RPAREN178_tree=null;
 
         try {
-            // xquery/XQueryParser.g:749:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:749:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:751:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:751:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29830,23 +29836,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN177=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
+            LPAREN176=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5163); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN177_tree = this.adaptor.create(LPAREN177);
-            this.adaptor.addChild(root_0, LPAREN177_tree);
+            LPAREN176_tree = this.adaptor.create(LPAREN176);
+            this.adaptor.addChild(root_0, LPAREN176_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5161);
-            p_Expr178=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5165);
+            p_Expr177=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr178.getTree());
-            RPAREN179=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5164); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr177.getTree());
+            RPAREN178=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN179_tree = this.adaptor.create(RPAREN179);
-            this.adaptor.addChild(root_0, RPAREN179_tree);
+            RPAREN178_tree = this.adaptor.create(RPAREN178);
+            this.adaptor.addChild(root_0, RPAREN178_tree);
             }
-            // xquery/XQueryParser.g:749:71: ( p_CaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:751:71: ( p_CaseHybrid[$strict] )+
             var cnt83=0;
             loop83:
             do {
@@ -29860,13 +29866,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt83) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:71: p_CaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166);
-                    p_CaseHybrid180=this.p_CaseHybrid(strict);
+                    // xquery/XQueryParser.g:751:71: p_CaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170);
+                    p_CaseHybrid179=this.p_CaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid180.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid179.getTree());
 
 
                     break;
@@ -29882,7 +29888,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt83++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29890,7 +29896,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:749:119: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:751:119: (d= DOLLAR v= p_VarName )?
             var alt84=2;
             var LA84_0 = this.input.LA(1);
 
@@ -29899,13 +29905,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt84) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:120: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:751:120: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5183);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5187);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -29920,7 +29926,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5191); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5195); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29928,12 +29934,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195);
-            p_Hybrid181=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199);
+            p_Hybrid180=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid181.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid180.getTree());
 
 
 
@@ -29970,7 +29976,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:753:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
+    // xquery/XQueryParser.g:755:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
     // $ANTLR start "p_CaseHybrid"
     p_CaseHybrid: function(strict) {
         var retval = new XQueryParser.p_CaseHybrid_return();
@@ -29981,18 +29987,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_SequenceTypeUnion182 = null;
-         var p_ExprSingle183 = null;
+         var p_SequenceTypeUnion181 = null;
+         var p_ExprSingle182 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:754:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
-            // xquery/XQueryParser.g:754:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
+            // xquery/XQueryParser.g:756:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
+            // xquery/XQueryParser.g:756:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5225); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5229); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30000,7 +30006,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:754:33: (d= DOLLAR v= p_VarName k= AS )?
+            // xquery/XQueryParser.g:756:33: (d= DOLLAR v= p_VarName k= AS )?
             var alt85=2;
             var LA85_0 = this.input.LA(1);
 
@@ -30009,13 +30015,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt85) {
                 case 1 :
-                    // xquery/XQueryParser.g:754:34: d= DOLLAR v= p_VarName k= AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5232); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:756:34: d= DOLLAR v= p_VarName k= AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5236); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5236);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5240);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -30024,7 +30030,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5242); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5246); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30038,13 +30044,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248);
-            p_SequenceTypeUnion182=this.p_SequenceTypeUnion();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252);
+            p_SequenceTypeUnion181=this.p_SequenceTypeUnion();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion182.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5252); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion181.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5256); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30052,12 +30058,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5256);
-            p_ExprSingle183=this.p_ExprSingle(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5260);
+            p_ExprSingle182=this.p_ExprSingle(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle183.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle182.getTree());
 
 
 
@@ -30094,7 +30100,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:758:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
+    // xquery/XQueryParser.g:760:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
     // $ANTLR start "p_SequenceTypeUnion"
     p_SequenceTypeUnion: function() {
         var retval = new XQueryParser.p_SequenceTypeUnion_return();
@@ -30102,24 +30108,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR185 = null;
-         var p_SequenceType184 = null;
-         var p_SequenceType186 = null;
+        var VBAR184 = null;
+         var p_SequenceType183 = null;
+         var p_SequenceType185 = null;
 
-        var VBAR185_tree=null;
+        var VBAR184_tree=null;
 
         try {
-            // xquery/XQueryParser.g:759:9: ( p_SequenceType ( VBAR p_SequenceType )* )
-            // xquery/XQueryParser.g:759:11: p_SequenceType ( VBAR p_SequenceType )*
+            // xquery/XQueryParser.g:761:9: ( p_SequenceType ( VBAR p_SequenceType )* )
+            // xquery/XQueryParser.g:761:11: p_SequenceType ( VBAR p_SequenceType )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283);
-            p_SequenceType184=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287);
+            p_SequenceType183=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType184.getTree());
-            // xquery/XQueryParser.g:759:26: ( VBAR p_SequenceType )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType183.getTree());
+            // xquery/XQueryParser.g:761:26: ( VBAR p_SequenceType )*
             loop86:
             do {
                 var alt86=2;
@@ -30132,18 +30138,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt86) {
                 case 1 :
-                    // xquery/XQueryParser.g:759:27: VBAR p_SequenceType
-                    VBAR185=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5286); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:761:27: VBAR p_SequenceType
+                    VBAR184=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    VBAR185_tree = this.adaptor.create(VBAR185);
-                    this.adaptor.addChild(root_0, VBAR185_tree);
+                    VBAR184_tree = this.adaptor.create(VBAR184);
+                    this.adaptor.addChild(root_0, VBAR184_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288);
-                    p_SequenceType186=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292);
+                    p_SequenceType185=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType186.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType185.getTree());
 
 
                     break;
@@ -30189,7 +30195,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:763:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:765:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
     // $ANTLR start "p_IfHybrid"
     p_IfHybrid: function(strict) {
         var retval = new XQueryParser.p_IfHybrid_return();
@@ -30198,22 +30204,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN187 = null;
-        var RPAREN189 = null;
-         var p_Expr188 = null;
+        var LPAREN186 = null;
+        var RPAREN188 = null;
+         var p_Expr187 = null;
+         var p_Hybrid189 = null;
          var p_Hybrid190 = null;
-         var p_Hybrid191 = null;
 
         var k_tree=null;
-        var LPAREN187_tree=null;
-        var RPAREN189_tree=null;
+        var LPAREN186_tree=null;
+        var RPAREN188_tree=null;
 
         try {
-            // xquery/XQueryParser.g:764:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:764:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:766:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:766:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5319); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5323); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30221,23 +30227,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN187=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5323); if (this.state.failed) return retval;
+            LPAREN186=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN187_tree = this.adaptor.create(LPAREN187);
-            this.adaptor.addChild(root_0, LPAREN187_tree);
+            LPAREN186_tree = this.adaptor.create(LPAREN186);
+            this.adaptor.addChild(root_0, LPAREN186_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5325);
-            p_Expr188=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5329);
+            p_Expr187=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr188.getTree());
-            RPAREN189=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5328); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr187.getTree());
+            RPAREN188=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN189_tree = this.adaptor.create(RPAREN189);
-            this.adaptor.addChild(root_0, RPAREN189_tree);
+            RPAREN188_tree = this.adaptor.create(RPAREN188);
+            this.adaptor.addChild(root_0, RPAREN188_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5332); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5336); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30245,26 +30251,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5336);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5340);
+            p_Hybrid189=this.p_Hybrid(strict, false);
+
+            this.state._fsp--;
+            if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid189.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) {
+            k_tree = this.adaptor.create(k);
+            this.adaptor.addChild(root_0, k_tree);
+            }
+            if ( this.state.backtracking===0 ) {
+              this.ak(k);
+            }
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5349);
             p_Hybrid190=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid190.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5341); if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) {
-            k_tree = this.adaptor.create(k);
-            this.adaptor.addChild(root_0, k_tree);
-            }
-            if ( this.state.backtracking===0 ) {
-              this.ak(k);
-            }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5345);
-            p_Hybrid191=this.p_Hybrid(strict, false);
-
-            this.state._fsp--;
-            if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid191.getTree());
 
 
 
@@ -30301,7 +30307,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:768:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
+    // xquery/XQueryParser.g:770:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
     // $ANTLR start "p_TryCatchExpr"
     p_TryCatchExpr: function() {
         var retval = new XQueryParser.p_TryCatchExpr_return();
@@ -30309,22 +30315,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_TryClause192 = null;
-         var p_CatchClause193 = null;
+         var p_TryClause191 = null;
+         var p_CatchClause192 = null;
 
 
         try {
-            // xquery/XQueryParser.g:769:9: ( p_TryClause ( p_CatchClause )+ )
-            // xquery/XQueryParser.g:769:11: p_TryClause ( p_CatchClause )+
+            // xquery/XQueryParser.g:771:9: ( p_TryClause ( p_CatchClause )+ )
+            // xquery/XQueryParser.g:771:11: p_TryClause ( p_CatchClause )+
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5372);
-            p_TryClause192=this.p_TryClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5376);
+            p_TryClause191=this.p_TryClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause192.getTree());
-            // xquery/XQueryParser.g:769:23: ( p_CatchClause )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause191.getTree());
+            // xquery/XQueryParser.g:771:23: ( p_CatchClause )+
             var cnt87=0;
             loop87:
             do {
@@ -30338,13 +30344,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt87) {
                 case 1 :
-                    // xquery/XQueryParser.g:769:23: p_CatchClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5374);
-                    p_CatchClause193=this.p_CatchClause();
+                    // xquery/XQueryParser.g:771:23: p_CatchClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5378);
+                    p_CatchClause192=this.p_CatchClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause193.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause192.getTree());
 
 
                     break;
@@ -30396,7 +30402,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:773:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
+    // xquery/XQueryParser.g:775:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
     // $ANTLR start "p_TryClause"
     p_TryClause: function() {
         var retval = new XQueryParser.p_TryClause_return();
@@ -30405,20 +30411,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET194 = null;
-        var RBRACKET196 = null;
-         var p_TryTargetExpr195 = null;
+        var LBRACKET193 = null;
+        var RBRACKET195 = null;
+         var p_TryTargetExpr194 = null;
 
         var k_tree=null;
-        var LBRACKET194_tree=null;
-        var RBRACKET196_tree=null;
+        var LBRACKET193_tree=null;
+        var RBRACKET195_tree=null;
 
         try {
-            // xquery/XQueryParser.g:774:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
-            // xquery/XQueryParser.g:774:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
+            // xquery/XQueryParser.g:776:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
+            // xquery/XQueryParser.g:776:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5403); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5407); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30426,21 +30432,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET194=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5407); if (this.state.failed) return retval;
+            LBRACKET193=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET194_tree = this.adaptor.create(LBRACKET194);
-            this.adaptor.addChild(root_0, LBRACKET194_tree);
+            LBRACKET193_tree = this.adaptor.create(LBRACKET193);
+            this.adaptor.addChild(root_0, LBRACKET193_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5409);
-            p_TryTargetExpr195=this.p_TryTargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5413);
+            p_TryTargetExpr194=this.p_TryTargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr195.getTree());
-            RBRACKET196=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr194.getTree());
+            RBRACKET195=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5415); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET196_tree = this.adaptor.create(RBRACKET196);
-            this.adaptor.addChild(root_0, RBRACKET196_tree);
+            RBRACKET195_tree = this.adaptor.create(RBRACKET195);
+            this.adaptor.addChild(root_0, RBRACKET195_tree);
             }
 
 
@@ -30478,7 +30484,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:778:1: p_TryTargetExpr : p_Expr[false,false] ;
+    // xquery/XQueryParser.g:780:1: p_TryTargetExpr : p_Expr[false,false] ;
     // $ANTLR start "p_TryTargetExpr"
     p_TryTargetExpr: function() {
         var retval = new XQueryParser.p_TryTargetExpr_return();
@@ -30486,20 +30492,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr197 = null;
+         var p_Expr196 = null;
 
 
         try {
-            // xquery/XQueryParser.g:779:9: ( p_Expr[false,false] )
-            // xquery/XQueryParser.g:779:11: p_Expr[false,false]
+            // xquery/XQueryParser.g:781:9: ( p_Expr[false,false] )
+            // xquery/XQueryParser.g:781:11: p_Expr[false,false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5437);
-            p_Expr197=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5441);
+            p_Expr196=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr197.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr196.getTree());
 
 
 
@@ -30536,7 +30542,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:783:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
+    // xquery/XQueryParser.g:785:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
     // $ANTLR start "p_CatchClause"
     p_CatchClause: function() {
         var retval = new XQueryParser.p_CatchClause_return();
@@ -30545,21 +30551,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET199 = null;
-        var RBRACKET201 = null;
-         var p_CatchErrorList198 = null;
-         var p_Expr200 = null;
+        var LBRACKET198 = null;
+        var RBRACKET200 = null;
+         var p_CatchErrorList197 = null;
+         var p_Expr199 = null;
 
         var k_tree=null;
-        var LBRACKET199_tree=null;
-        var RBRACKET201_tree=null;
+        var LBRACKET198_tree=null;
+        var RBRACKET200_tree=null;
 
         try {
-            // xquery/XQueryParser.g:784:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
-            // xquery/XQueryParser.g:784:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
+            // xquery/XQueryParser.g:786:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
+            // xquery/XQueryParser.g:786:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5466); if (this.state.failed) return retval;
+            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30567,27 +30573,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5470);
-            p_CatchErrorList198=this.p_CatchErrorList();
+            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5474);
+            p_CatchErrorList197=this.p_CatchErrorList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList198.getTree());
-            LBRACKET199=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5472); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList197.getTree());
+            LBRACKET198=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET199_tree = this.adaptor.create(LBRACKET199);
-            this.adaptor.addChild(root_0, LBRACKET199_tree);
+            LBRACKET198_tree = this.adaptor.create(LBRACKET198);
+            this.adaptor.addChild(root_0, LBRACKET198_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5474);
-            p_Expr200=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5478);
+            p_Expr199=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr200.getTree());
-            RBRACKET201=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5477); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr199.getTree());
+            RBRACKET200=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5481); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET201_tree = this.adaptor.create(RBRACKET201);
-            this.adaptor.addChild(root_0, RBRACKET201_tree);
+            RBRACKET200_tree = this.adaptor.create(RBRACKET200);
+            this.adaptor.addChild(root_0, RBRACKET200_tree);
             }
 
 
@@ -30625,7 +30631,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:788:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
+    // xquery/XQueryParser.g:790:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
     // $ANTLR start "p_CatchErrorList"
     p_CatchErrorList: function() {
         var retval = new XQueryParser.p_CatchErrorList_return();
@@ -30633,14 +30639,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR203 = null;
-         var p_NameTest202 = null;
-         var p_NameTest204 = null;
+        var VBAR202 = null;
+         var p_NameTest201 = null;
+         var p_NameTest203 = null;
 
-        var VBAR203_tree=null;
+        var VBAR202_tree=null;
 
         try {
-            // xquery/XQueryParser.g:789:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
+            // xquery/XQueryParser.g:791:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
             var alt89=2;
             var LA89_0 = this.input.LA(1);
 
@@ -30659,16 +30665,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt89) {
                 case 1 :
-                    // xquery/XQueryParser.g:789:11: p_NameTest ( VBAR p_NameTest )*
+                    // xquery/XQueryParser.g:791:11: p_NameTest ( VBAR p_NameTest )*
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5503);
-                    p_NameTest202=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5507);
+                    p_NameTest201=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest202.getTree());
-                    // xquery/XQueryParser.g:789:22: ( VBAR p_NameTest )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest201.getTree());
+                    // xquery/XQueryParser.g:791:22: ( VBAR p_NameTest )*
                     loop88:
                     do {
                         var alt88=2;
@@ -30681,18 +30687,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt88) {
                         case 1 :
-                            // xquery/XQueryParser.g:789:23: VBAR p_NameTest
-                            VBAR203=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5506); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:791:23: VBAR p_NameTest
+                            VBAR202=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5510); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR203_tree = this.adaptor.create(VBAR203);
-                            this.adaptor.addChild(root_0, VBAR203_tree);
+                            VBAR202_tree = this.adaptor.create(VBAR202);
+                            this.adaptor.addChild(root_0, VBAR202_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5508);
-                            p_NameTest204=this.p_NameTest();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5512);
+                            p_NameTest203=this.p_NameTest();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest204.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest203.getTree());
 
 
                             break;
@@ -30706,15 +30712,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:790:11: {...}? => ()
+                    // xquery/XQueryParser.g:792:11: {...}? => ()
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_CatchErrorList", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:790:29: ()
-                    // xquery/XQueryParser.g:790:43: 
+                    // xquery/XQueryParser.g:792:29: ()
+                    // xquery/XQueryParser.g:792:43: 
 
 
 
@@ -30755,7 +30761,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:794:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
+    // xquery/XQueryParser.g:796:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
     // $ANTLR start "p_OrExpr"
     p_OrExpr: function() {
         var retval = new XQueryParser.p_OrExpr_return();
@@ -30764,23 +30770,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AndExpr204 = null;
          var p_AndExpr205 = null;
-         var p_AndExpr206 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:795:9: ( p_AndExpr (k= OR p_AndExpr )* )
-            // xquery/XQueryParser.g:795:11: p_AndExpr (k= OR p_AndExpr )*
+            // xquery/XQueryParser.g:797:9: ( p_AndExpr (k= OR p_AndExpr )* )
+            // xquery/XQueryParser.g:797:11: p_AndExpr (k= OR p_AndExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5553);
-            p_AndExpr205=this.p_AndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5557);
+            p_AndExpr204=this.p_AndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
-            // xquery/XQueryParser.g:795:21: (k= OR p_AndExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr204.getTree());
+            // xquery/XQueryParser.g:797:21: (k= OR p_AndExpr )*
             loop90:
             do {
                 var alt90=2;
@@ -30793,8 +30799,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt90) {
                 case 1 :
-                    // xquery/XQueryParser.g:795:23: k= OR p_AndExpr
-                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5559); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:797:23: k= OR p_AndExpr
+                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5563); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30802,12 +30808,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5563);
-                    p_AndExpr206=this.p_AndExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5567);
+                    p_AndExpr205=this.p_AndExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr206.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
 
 
                     break;
@@ -30853,7 +30859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:799:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
+    // xquery/XQueryParser.g:801:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
     // $ANTLR start "p_AndExpr"
     p_AndExpr: function() {
         var retval = new XQueryParser.p_AndExpr_return();
@@ -30862,23 +30868,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_ComparisonExpr206 = null;
          var p_ComparisonExpr207 = null;
-         var p_ComparisonExpr208 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:800:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
-            // xquery/XQueryParser.g:800:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
+            // xquery/XQueryParser.g:802:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
+            // xquery/XQueryParser.g:802:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5592);
-            p_ComparisonExpr207=this.p_ComparisonExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5596);
+            p_ComparisonExpr206=this.p_ComparisonExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
-            // xquery/XQueryParser.g:800:28: (k= AND p_ComparisonExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr206.getTree());
+            // xquery/XQueryParser.g:802:28: (k= AND p_ComparisonExpr )*
             loop91:
             do {
                 var alt91=2;
@@ -30891,8 +30897,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt91) {
                 case 1 :
-                    // xquery/XQueryParser.g:800:30: k= AND p_ComparisonExpr
-                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5598); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:802:30: k= AND p_ComparisonExpr
+                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30900,12 +30906,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5602);
-                    p_ComparisonExpr208=this.p_ComparisonExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5606);
+                    p_ComparisonExpr207=this.p_ComparisonExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr208.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
 
 
                     break;
@@ -30951,7 +30957,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:805:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
+    // xquery/XQueryParser.g:807:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
     // $ANTLR start "p_ComparisonExpr"
     p_ComparisonExpr: function() {
         var retval = new XQueryParser.p_ComparisonExpr_return();
@@ -30959,25 +30965,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTContainsExpr209 = null;
-         var p_ValueComp210 = null;
-         var p_GeneralComp211 = null;
-         var p_NodeComp212 = null;
-         var p_FTContainsExpr213 = null;
+         var p_FTContainsExpr208 = null;
+         var p_ValueComp209 = null;
+         var p_GeneralComp210 = null;
+         var p_NodeComp211 = null;
+         var p_FTContainsExpr212 = null;
 
 
         try {
-            // xquery/XQueryParser.g:806:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
-            // xquery/XQueryParser.g:806:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            // xquery/XQueryParser.g:808:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
+            // xquery/XQueryParser.g:808:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632);
-            p_FTContainsExpr209=this.p_FTContainsExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636);
+            p_FTContainsExpr208=this.p_FTContainsExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr209.getTree());
-            // xquery/XQueryParser.g:806:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr208.getTree());
+            // xquery/XQueryParser.g:808:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             var alt93=2;
             var LA93_0 = this.input.LA(1);
 
@@ -30986,8 +30992,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt93) {
                 case 1 :
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
                     var alt92=3;
                     switch ( this.input.LA(1) ) {
                     case EQ:
@@ -31021,47 +31027,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     switch (alt92) {
                         case 1 :
-                            // xquery/XQueryParser.g:806:31: p_ValueComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5637);
-                            p_ValueComp210=this.p_ValueComp();
+                            // xquery/XQueryParser.g:808:31: p_ValueComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5641);
+                            p_ValueComp209=this.p_ValueComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp210.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp209.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:806:45: p_GeneralComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641);
-                            p_GeneralComp211=this.p_GeneralComp();
+                            // xquery/XQueryParser.g:808:45: p_GeneralComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645);
+                            p_GeneralComp210=this.p_GeneralComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp211.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp210.getTree());
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:806:61: p_NodeComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5645);
-                            p_NodeComp212=this.p_NodeComp();
+                            // xquery/XQueryParser.g:808:61: p_NodeComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5649);
+                            p_NodeComp211=this.p_NodeComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp212.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp211.getTree());
 
 
                             break;
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648);
-                    p_FTContainsExpr213=this.p_FTContainsExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652);
+                    p_FTContainsExpr212=this.p_FTContainsExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr213.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr212.getTree());
 
 
                     break;
@@ -31104,7 +31110,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:810:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
+    // xquery/XQueryParser.g:812:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
     // $ANTLR start "p_RangeExpr"
     p_RangeExpr: function() {
         var retval = new XQueryParser.p_RangeExpr_return();
@@ -31113,23 +31119,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AdditiveExpr213 = null;
          var p_AdditiveExpr214 = null;
-         var p_AdditiveExpr215 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:811:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
-            // xquery/XQueryParser.g:811:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
+            // xquery/XQueryParser.g:813:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
+            // xquery/XQueryParser.g:813:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677);
-            p_AdditiveExpr214=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681);
+            p_AdditiveExpr213=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
-            // xquery/XQueryParser.g:811:26: (k= TO p_AdditiveExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr213.getTree());
+            // xquery/XQueryParser.g:813:26: (k= TO p_AdditiveExpr )?
             var alt94=2;
             var LA94_0 = this.input.LA(1);
 
@@ -31138,8 +31144,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt94) {
                 case 1 :
-                    // xquery/XQueryParser.g:811:28: k= TO p_AdditiveExpr
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5683); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:813:28: k= TO p_AdditiveExpr
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31147,12 +31153,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687);
-                    p_AdditiveExpr215=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691);
+                    p_AdditiveExpr214=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr215.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
 
 
                     break;
@@ -31195,7 +31201,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:815:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
+    // xquery/XQueryParser.g:817:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
     // $ANTLR start "p_AdditiveExpr"
     p_AdditiveExpr: function() {
         var retval = new XQueryParser.p_AdditiveExpr_return();
@@ -31204,23 +31210,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
+         var p_MultiplicativeExpr215 = null;
          var p_MultiplicativeExpr216 = null;
-         var p_MultiplicativeExpr217 = null;
 
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:816:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
-            // xquery/XQueryParser.g:816:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            // xquery/XQueryParser.g:818:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
+            // xquery/XQueryParser.g:818:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716);
-            p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720);
+            p_MultiplicativeExpr215=this.p_MultiplicativeExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
-            // xquery/XQueryParser.g:816:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr215.getTree());
+            // xquery/XQueryParser.g:818:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             loop96:
             do {
                 var alt96=2;
@@ -31233,8 +31239,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt96) {
                 case 1 :
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS )
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS )
                     var alt95=2;
                     var LA95_0 = this.input.LA(1);
 
@@ -31253,8 +31259,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt95) {
                         case 1 :
-                            // xquery/XQueryParser.g:816:35: o= PLUS
-                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5723); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:35: o= PLUS
+                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5727); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31266,8 +31272,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:816:59: o= MINUS
-                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5731); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:59: o= MINUS
+                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5735); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31281,12 +31287,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736);
-                    p_MultiplicativeExpr217=this.p_MultiplicativeExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740);
+                    p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr217.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
 
 
                     break;
@@ -31332,7 +31338,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:820:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
+    // xquery/XQueryParser.g:822:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
     // $ANTLR start "p_MultiplicativeExpr"
     p_MultiplicativeExpr: function() {
         var retval = new XQueryParser.p_MultiplicativeExpr_return();
@@ -31342,24 +31348,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var o = null;
         var k = null;
+         var p_UnionExpr217 = null;
          var p_UnionExpr218 = null;
-         var p_UnionExpr219 = null;
 
         var o_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:821:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
-            // xquery/XQueryParser.g:821:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            // xquery/XQueryParser.g:823:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
+            // xquery/XQueryParser.g:823:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765);
-            p_UnionExpr218=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769);
+            p_UnionExpr217=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
-            // xquery/XQueryParser.g:821:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr217.getTree());
+            // xquery/XQueryParser.g:823:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             loop99:
             do {
                 var alt99=2;
@@ -31372,8 +31378,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt99) {
                 case 1 :
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
                     var alt98=2;
                     var LA98_0 = this.input.LA(1);
 
@@ -31392,8 +31398,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt98) {
                         case 1 :
-                            // xquery/XQueryParser.g:821:26: o= STAR
-                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5772); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:823:26: o= STAR
+                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5776); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31405,8 +31411,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
                             var alt97=3;
                             switch ( this.input.LA(1) ) {
                             case DIV:
@@ -31428,8 +31434,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             switch (alt97) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:821:51: k= DIV
-                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5781); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:51: k= DIV
+                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5785); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31438,8 +31444,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:821:59: k= IDIV
-                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5787); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:59: k= IDIV
+                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5791); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31448,8 +31454,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 3 :
-                                    // xquery/XQueryParser.g:821:68: k= MOD
-                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5793); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:68: k= MOD
+                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5797); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31469,12 +31475,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799);
-                    p_UnionExpr219=this.p_UnionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803);
+                    p_UnionExpr218=this.p_UnionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr219.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
 
 
                     break;
@@ -31520,7 +31526,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:825:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
+    // xquery/XQueryParser.g:827:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
     // $ANTLR start "p_UnionExpr"
     p_UnionExpr: function() {
         var retval = new XQueryParser.p_UnionExpr_return();
@@ -31529,25 +31535,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var VBAR221 = null;
-         var p_IntersectExceptExpr220 = null;
-         var p_IntersectExceptExpr222 = null;
+        var VBAR220 = null;
+         var p_IntersectExceptExpr219 = null;
+         var p_IntersectExceptExpr221 = null;
 
         var k_tree=null;
-        var VBAR221_tree=null;
+        var VBAR220_tree=null;
 
         try {
-            // xquery/XQueryParser.g:826:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
-            // xquery/XQueryParser.g:826:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            // xquery/XQueryParser.g:828:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
+            // xquery/XQueryParser.g:828:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828);
-            p_IntersectExceptExpr220=this.p_IntersectExceptExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832);
+            p_IntersectExceptExpr219=this.p_IntersectExceptExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr220.getTree());
-            // xquery/XQueryParser.g:826:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr219.getTree());
+            // xquery/XQueryParser.g:828:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             loop101:
             do {
                 var alt101=2;
@@ -31560,8 +31566,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt101) {
                 case 1 :
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR ) p_IntersectExceptExpr
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR )
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR ) p_IntersectExceptExpr
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR )
                     var alt100=2;
                     var LA100_0 = this.input.LA(1);
 
@@ -31580,8 +31586,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt100) {
                         case 1 :
-                            // xquery/XQueryParser.g:826:36: k= UNION
-                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5835); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:36: k= UNION
+                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5839); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31593,11 +31599,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:826:61: VBAR
-                            VBAR221=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5841); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:61: VBAR
+                            VBAR220=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5845); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR221_tree = this.adaptor.create(VBAR221);
-                            this.adaptor.addChild(root_0, VBAR221_tree);
+                            VBAR220_tree = this.adaptor.create(VBAR220);
+                            this.adaptor.addChild(root_0, VBAR220_tree);
                             }
 
 
@@ -31605,12 +31611,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844);
-                    p_IntersectExceptExpr222=this.p_IntersectExceptExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848);
+                    p_IntersectExceptExpr221=this.p_IntersectExceptExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr222.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr221.getTree());
 
 
                     break;
@@ -31656,7 +31662,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:830:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
+    // xquery/XQueryParser.g:832:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
     // $ANTLR start "p_IntersectExceptExpr"
     p_IntersectExceptExpr: function() {
         var retval = new XQueryParser.p_IntersectExceptExpr_return();
@@ -31665,23 +31671,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_InstanceofExpr222 = null;
          var p_InstanceofExpr223 = null;
-         var p_InstanceofExpr224 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:831:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
-            // xquery/XQueryParser.g:831:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            // xquery/XQueryParser.g:833:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
+            // xquery/XQueryParser.g:833:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873);
-            p_InstanceofExpr223=this.p_InstanceofExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877);
+            p_InstanceofExpr222=this.p_InstanceofExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
-            // xquery/XQueryParser.g:831:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr222.getTree());
+            // xquery/XQueryParser.g:833:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             loop103:
             do {
                 var alt103=2;
@@ -31694,8 +31700,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt103) {
                 case 1 :
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT )
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT )
                     var alt102=2;
                     var LA102_0 = this.input.LA(1);
 
@@ -31714,8 +31720,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt102) {
                         case 1 :
-                            // xquery/XQueryParser.g:831:31: k= INTERSECT
-                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:31: k= INTERSECT
+                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31724,8 +31730,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:831:45: k= EXCEPT
-                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:45: k= EXCEPT
+                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31739,12 +31745,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891);
-                    p_InstanceofExpr224=this.p_InstanceofExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895);
+                    p_InstanceofExpr223=this.p_InstanceofExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr224.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
 
 
                     break;
@@ -31790,7 +31796,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:835:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
+    // xquery/XQueryParser.g:837:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
     // $ANTLR start "p_InstanceofExpr"
     p_InstanceofExpr: function() {
         var retval = new XQueryParser.p_InstanceofExpr_return();
@@ -31799,23 +31805,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TreatExpr225 = null;
-         var p_SequenceType226 = null;
+         var p_TreatExpr224 = null;
+         var p_SequenceType225 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:836:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
-            // xquery/XQueryParser.g:836:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
+            // xquery/XQueryParser.g:838:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
+            // xquery/XQueryParser.g:838:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920);
-            p_TreatExpr225=this.p_TreatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924);
+            p_TreatExpr224=this.p_TreatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr225.getTree());
-            // xquery/XQueryParser.g:836:23: (k= INSTANCE k= OF p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr224.getTree());
+            // xquery/XQueryParser.g:838:23: (k= INSTANCE k= OF p_SequenceType )?
             var alt104=2;
             var LA104_0 = this.input.LA(1);
 
@@ -31824,8 +31830,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt104) {
                 case 1 :
-                    // xquery/XQueryParser.g:836:25: k= INSTANCE k= OF p_SequenceType
-                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:838:25: k= INSTANCE k= OF p_SequenceType
+                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31833,7 +31839,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5932); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5936); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31841,12 +31847,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5936);
-                    p_SequenceType226=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5940);
+                    p_SequenceType225=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType226.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType225.getTree());
 
 
                     break;
@@ -31889,7 +31895,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:840:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
+    // xquery/XQueryParser.g:842:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
     // $ANTLR start "p_TreatExpr"
     p_TreatExpr: function() {
         var retval = new XQueryParser.p_TreatExpr_return();
@@ -31898,23 +31904,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastableExpr227 = null;
-         var p_SequenceType228 = null;
+         var p_CastableExpr226 = null;
+         var p_SequenceType227 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:841:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
-            // xquery/XQueryParser.g:841:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
+            // xquery/XQueryParser.g:843:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
+            // xquery/XQueryParser.g:843:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5964);
-            p_CastableExpr227=this.p_CastableExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5968);
+            p_CastableExpr226=this.p_CastableExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr227.getTree());
-            // xquery/XQueryParser.g:841:26: (k= TREAT k= AS p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr226.getTree());
+            // xquery/XQueryParser.g:843:26: (k= TREAT k= AS p_SequenceType )?
             var alt105=2;
             var LA105_0 = this.input.LA(1);
 
@@ -31923,8 +31929,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt105) {
                 case 1 :
-                    // xquery/XQueryParser.g:841:28: k= TREAT k= AS p_SequenceType
-                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5970); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:843:28: k= TREAT k= AS p_SequenceType
+                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31932,7 +31938,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5976); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31940,12 +31946,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5980);
-                    p_SequenceType228=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5984);
+                    p_SequenceType227=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType228.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType227.getTree());
 
 
                     break;
@@ -31988,7 +31994,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:845:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:847:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
     // $ANTLR start "p_CastableExpr"
     p_CastableExpr: function() {
         var retval = new XQueryParser.p_CastableExpr_return();
@@ -31997,23 +32003,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastExpr229 = null;
-         var p_SingleType230 = null;
+         var p_CastExpr228 = null;
+         var p_SingleType229 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:846:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:846:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
+            // xquery/XQueryParser.g:848:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:848:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6017);
-            p_CastExpr229=this.p_CastExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6021);
+            p_CastExpr228=this.p_CastExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr229.getTree());
-            // xquery/XQueryParser.g:846:22: (k= CASTABLE k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr228.getTree());
+            // xquery/XQueryParser.g:848:22: (k= CASTABLE k= AS p_SingleType )?
             var alt106=2;
             var LA106_0 = this.input.LA(1);
 
@@ -32022,8 +32028,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt106) {
                 case 1 :
-                    // xquery/XQueryParser.g:846:24: k= CASTABLE k= AS p_SingleType
-                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6023); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:848:24: k= CASTABLE k= AS p_SingleType
+                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6027); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32031,7 +32037,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6029); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6033); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32039,12 +32045,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6033);
-                    p_SingleType230=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6037);
+                    p_SingleType229=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType230.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType229.getTree());
 
 
                     break;
@@ -32087,7 +32093,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:850:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:852:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
     // $ANTLR start "p_CastExpr"
     p_CastExpr: function() {
         var retval = new XQueryParser.p_CastExpr_return();
@@ -32096,23 +32102,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_UnaryExpr231 = null;
-         var p_SingleType232 = null;
+         var p_UnaryExpr230 = null;
+         var p_SingleType231 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:851:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:851:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
+            // xquery/XQueryParser.g:853:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:853:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6070);
-            p_UnaryExpr231=this.p_UnaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6074);
+            p_UnaryExpr230=this.p_UnaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr231.getTree());
-            // xquery/XQueryParser.g:851:23: (k= CAST k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr230.getTree());
+            // xquery/XQueryParser.g:853:23: (k= CAST k= AS p_SingleType )?
             var alt107=2;
             var LA107_0 = this.input.LA(1);
 
@@ -32121,8 +32127,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt107) {
                 case 1 :
-                    // xquery/XQueryParser.g:851:25: k= CAST k= AS p_SingleType
-                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6076); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:853:25: k= CAST k= AS p_SingleType
+                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6080); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32130,7 +32136,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6082); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6086); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32138,12 +32144,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6086);
-                    p_SingleType232=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6090);
+                    p_SingleType231=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType232.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType231.getTree());
 
 
                     break;
@@ -32186,7 +32192,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:855:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
+    // xquery/XQueryParser.g:857:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
     // $ANTLR start "p_UnaryExpr"
     p_UnaryExpr: function() {
         var retval = new XQueryParser.p_UnaryExpr_return();
@@ -32195,16 +32201,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
-         var p_ValueExpr233 = null;
+         var p_ValueExpr232 = null;
 
         var o_tree=null;
         var stream_PLUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token PLUS");
         var stream_MINUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token MINUS");
         var stream_p_ValueExpr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ValueExpr");
         try {
-            // xquery/XQueryParser.g:856:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )* p_ValueExpr
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )*
+            // xquery/XQueryParser.g:858:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )* p_ValueExpr
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )*
             loop108:
             do {
                 var alt108=3;
@@ -32220,8 +32226,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt108) {
                 case 1 :
-                    // xquery/XQueryParser.g:856:12: o= PLUS
-                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6118); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:12: o= PLUS
+                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6122); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_PLUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -32231,8 +32237,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:856:36: o= MINUS
-                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6126); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:36: o= MINUS
+                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6130); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_MINUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -32247,12 +32253,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6131);
-            p_ValueExpr233=this.p_ValueExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6135);
+            p_ValueExpr232=this.p_ValueExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr233.getTree());
+            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr232.getTree());
 
 
             // AST REWRITE
@@ -32266,14 +32272,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 857:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
+            // 859:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
             {
-                // xquery/XQueryParser.g:857:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
+                // xquery/XQueryParser.g:859:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(UnaryExpr, "UnaryExpr"), root_1);
 
-                // xquery/XQueryParser.g:857:32: ( PLUS )*
+                // xquery/XQueryParser.g:859:32: ( PLUS )*
                 while ( stream_PLUS.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_PLUS.nextNode());
 
@@ -32322,7 +32328,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:861:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
+    // xquery/XQueryParser.g:863:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
     // $ANTLR start "p_ValueExpr"
     p_ValueExpr: function() {
         var retval = new XQueryParser.p_ValueExpr_return();
@@ -32330,13 +32336,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ValidateExpr234 = null;
-         var p_PathExpr235 = null;
-         var p_ExtensionExpr236 = null;
+         var p_ValidateExpr233 = null;
+         var p_PathExpr234 = null;
+         var p_ExtensionExpr235 = null;
 
 
         try {
-            // xquery/XQueryParser.g:862:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
+            // xquery/XQueryParser.g:864:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
             var alt109=3;
             switch ( this.input.LA(1) ) {
             case VALIDATE:
@@ -32602,41 +32608,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt109) {
                 case 1 :
-                    // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
+                    // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6201);
-                    p_ValidateExpr234=this.p_ValidateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6205);
+                    p_ValidateExpr233=this.p_ValidateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr234.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr233.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:863:11: p_PathExpr
+                    // xquery/XQueryParser.g:865:11: p_PathExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6213);
-                    p_PathExpr235=this.p_PathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6217);
+                    p_PathExpr234=this.p_PathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr235.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr234.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:864:11: p_ExtensionExpr
+                    // xquery/XQueryParser.g:866:11: p_ExtensionExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225);
-                    p_ExtensionExpr236=this.p_ExtensionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229);
+                    p_ExtensionExpr235=this.p_ExtensionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr236.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr235.getTree());
 
 
                     break;
@@ -32675,7 +32681,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:868:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
+    // xquery/XQueryParser.g:870:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
     // $ANTLR start "p_GeneralComp"
     p_GeneralComp: function() {
         var retval = new XQueryParser.p_GeneralComp_return();
@@ -32688,11 +32694,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:869:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             var alt110=6;
             switch ( this.input.LA(1) ) {
             case EQUAL:
@@ -32723,8 +32729,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt110) {
                 case 1 :
-                    // xquery/XQueryParser.g:869:12: o= EQUAL
-                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6254); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:12: o= EQUAL
+                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6258); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32733,8 +32739,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:869:22: o= NOTEQUAL
-                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6260); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:22: o= NOTEQUAL
+                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6264); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32743,8 +32749,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:869:35: o= SMALLER
-                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6266); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:35: o= SMALLER
+                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6270); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32753,8 +32759,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:869:47: o= SMALLEREQ
-                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6272); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:47: o= SMALLEREQ
+                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6276); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32763,8 +32769,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:869:61: o= GREATER
-                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6278); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:61: o= GREATER
+                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6282); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32773,8 +32779,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:869:73: o= GREATEREQ
-                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6284); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:73: o= GREATEREQ
+                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32824,7 +32830,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:873:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
+    // xquery/XQueryParser.g:875:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
     // $ANTLR start "p_ValueComp"
     p_ValueComp: function() {
         var retval = new XQueryParser.p_ValueComp_return();
@@ -32837,11 +32843,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:874:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             var alt111=6;
             switch ( this.input.LA(1) ) {
             case EQ:
@@ -32872,8 +32878,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt111) {
                 case 1 :
-                    // xquery/XQueryParser.g:874:12: k= EQ
-                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6316); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:12: k= EQ
+                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6320); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32882,8 +32888,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:874:19: k= NE
-                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6322); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:19: k= NE
+                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6326); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32892,8 +32898,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:874:26: k= LT
-                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6328); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:26: k= LT
+                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6332); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32902,8 +32908,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:874:33: k= LE
-                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6334); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:33: k= LE
+                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6338); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32912,8 +32918,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:874:40: k= GT
-                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6340); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:40: k= GT
+                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6344); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32922,8 +32928,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:874:47: k= GE
-                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6346); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:47: k= GE
+                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6350); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32973,7 +32979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:878:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
+    // xquery/XQueryParser.g:880:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
     // $ANTLR start "p_NodeComp"
     p_NodeComp: function() {
         var retval = new XQueryParser.p_NodeComp_return();
@@ -32982,15 +32988,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SMALLER_SMALLER237 = null;
-        var GREATER_GREATER238 = null;
+        var SMALLER_SMALLER236 = null;
+        var GREATER_GREATER237 = null;
 
         var k_tree=null;
-        var SMALLER_SMALLER237_tree=null;
-        var GREATER_GREATER238_tree=null;
+        var SMALLER_SMALLER236_tree=null;
+        var GREATER_GREATER237_tree=null;
 
         try {
-            // xquery/XQueryParser.g:879:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
+            // xquery/XQueryParser.g:881:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
             var alt112=3;
             switch ( this.input.LA(1) ) {
             case IS:
@@ -33012,10 +33018,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt112) {
                 case 1 :
-                    // xquery/XQueryParser.g:879:11: k= IS
+                    // xquery/XQueryParser.g:881:11: k= IS
                     root_0 = this.adaptor.nil();
 
-                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6377); if (this.state.failed) return retval;
+                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6381); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33027,25 +33033,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:879:33: SMALLER_SMALLER
+                    // xquery/XQueryParser.g:881:33: SMALLER_SMALLER
                     root_0 = this.adaptor.nil();
 
-                    SMALLER_SMALLER237=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383); if (this.state.failed) return retval;
+                    SMALLER_SMALLER236=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SMALLER_SMALLER237_tree = this.adaptor.create(SMALLER_SMALLER237);
-                    this.adaptor.addChild(root_0, SMALLER_SMALLER237_tree);
+                    SMALLER_SMALLER236_tree = this.adaptor.create(SMALLER_SMALLER236);
+                    this.adaptor.addChild(root_0, SMALLER_SMALLER236_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:879:51: GREATER_GREATER
+                    // xquery/XQueryParser.g:881:51: GREATER_GREATER
                     root_0 = this.adaptor.nil();
 
-                    GREATER_GREATER238=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6387); if (this.state.failed) return retval;
+                    GREATER_GREATER237=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6391); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    GREATER_GREATER238_tree = this.adaptor.create(GREATER_GREATER238);
-                    this.adaptor.addChild(root_0, GREATER_GREATER238_tree);
+                    GREATER_GREATER237_tree = this.adaptor.create(GREATER_GREATER237);
+                    this.adaptor.addChild(root_0, GREATER_GREATER237_tree);
                     }
 
 
@@ -33085,7 +33091,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:883:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:885:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_ValidateExpr"
     p_ValidateExpr: function() {
         var retval = new XQueryParser.p_ValidateExpr_return();
@@ -33094,22 +33100,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET241 = null;
-        var RBRACKET243 = null;
-         var p_ValidationMode239 = null;
-         var p_TypeName240 = null;
-         var p_Expr242 = null;
+        var LBRACKET240 = null;
+        var RBRACKET242 = null;
+         var p_ValidationMode238 = null;
+         var p_TypeName239 = null;
+         var p_Expr241 = null;
 
         var k_tree=null;
-        var LBRACKET241_tree=null;
-        var RBRACKET243_tree=null;
+        var LBRACKET240_tree=null;
+        var RBRACKET242_tree=null;
 
         try {
-            // xquery/XQueryParser.g:884:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:884:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:886:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:886:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6415); if (this.state.failed) return retval;
+            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6419); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33117,7 +33123,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:884:37: ( p_ValidationMode | k= TYPE p_TypeName )?
+            // xquery/XQueryParser.g:886:37: ( p_ValidationMode | k= TYPE p_TypeName )?
             var alt113=3;
             var LA113_0 = this.input.LA(1);
 
@@ -33129,19 +33135,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt113) {
                 case 1 :
-                    // xquery/XQueryParser.g:884:39: p_ValidationMode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6421);
-                    p_ValidationMode239=this.p_ValidationMode();
+                    // xquery/XQueryParser.g:886:39: p_ValidationMode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6425);
+                    p_ValidationMode238=this.p_ValidationMode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode239.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode238.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:884:58: k= TYPE p_TypeName
-                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6427); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:886:58: k= TYPE p_TypeName
+                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6431); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33149,33 +33155,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6431);
-                    p_TypeName240=this.p_TypeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6435);
+                    p_TypeName239=this.p_TypeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName240.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName239.getTree());
 
 
                     break;
 
             }
 
-            LBRACKET241=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6436); if (this.state.failed) return retval;
+            LBRACKET240=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6440); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET241_tree = this.adaptor.create(LBRACKET241);
-            this.adaptor.addChild(root_0, LBRACKET241_tree);
+            LBRACKET240_tree = this.adaptor.create(LBRACKET240);
+            this.adaptor.addChild(root_0, LBRACKET240_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6438);
-            p_Expr242=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6442);
+            p_Expr241=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr242.getTree());
-            RBRACKET243=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6441); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr241.getTree());
+            RBRACKET242=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET243_tree = this.adaptor.create(RBRACKET243);
-            this.adaptor.addChild(root_0, RBRACKET243_tree);
+            RBRACKET242_tree = this.adaptor.create(RBRACKET242);
+            this.adaptor.addChild(root_0, RBRACKET242_tree);
             }
 
 
@@ -33213,7 +33219,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:888:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
+    // xquery/XQueryParser.g:890:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
     // $ANTLR start "p_ValidationMode"
     p_ValidationMode: function() {
         var retval = new XQueryParser.p_ValidationMode_return();
@@ -33226,11 +33232,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:889:9: ( (k= LAX | k= STRICT ) )
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:9: ( (k= LAX | k= STRICT ) )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             var alt114=2;
             var LA114_0 = this.input.LA(1);
 
@@ -33249,8 +33255,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt114) {
                 case 1 :
-                    // xquery/XQueryParser.g:889:12: k= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6470); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:12: k= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33259,8 +33265,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:889:20: k= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6476); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:20: k= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33310,7 +33316,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:893:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
+    // xquery/XQueryParser.g:895:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
     // $ANTLR start "p_ExtensionExpr"
     p_ExtensionExpr: function() {
         var retval = new XQueryParser.p_ExtensionExpr_return();
@@ -33318,21 +33324,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma244 = null;
-        var LBRACKET245 = null;
-        var RBRACKET247 = null;
-         var p_Expr246 = null;
+        var L_Pragma243 = null;
+        var LBRACKET244 = null;
+        var RBRACKET246 = null;
+         var p_Expr245 = null;
 
-        var L_Pragma244_tree=null;
-        var LBRACKET245_tree=null;
-        var RBRACKET247_tree=null;
+        var L_Pragma243_tree=null;
+        var LBRACKET244_tree=null;
+        var RBRACKET246_tree=null;
 
         try {
-            // xquery/XQueryParser.g:894:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
+            // xquery/XQueryParser.g:896:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+
             var cnt115=0;
             loop115:
             do {
@@ -33346,11 +33352,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt115) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:11: L_Pragma
-                    L_Pragma244=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6505); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:896:11: L_Pragma
+                    L_Pragma243=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6509); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma244_tree = this.adaptor.create(L_Pragma244);
-                    this.adaptor.addChild(root_0, L_Pragma244_tree);
+                    L_Pragma243_tree = this.adaptor.create(L_Pragma243);
+                    this.adaptor.addChild(root_0, L_Pragma243_tree);
                     }
 
 
@@ -33367,12 +33373,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt115++;
             } while (true);
 
-            LBRACKET245=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6508); if (this.state.failed) return retval;
+            LBRACKET244=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET245_tree = this.adaptor.create(LBRACKET245);
-            this.adaptor.addChild(root_0, LBRACKET245_tree);
+            LBRACKET244_tree = this.adaptor.create(LBRACKET244);
+            this.adaptor.addChild(root_0, LBRACKET244_tree);
             }
-            // xquery/XQueryParser.g:894:30: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:896:30: ( p_Expr[true,true] )?
             var alt116=2;
             var LA116_0 = this.input.LA(1);
 
@@ -33381,23 +33387,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt116) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:30: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6510);
-                    p_Expr246=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:896:30: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6514);
+                    p_Expr245=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr246.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr245.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET247=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6514); if (this.state.failed) return retval;
+            RBRACKET246=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET247_tree = this.adaptor.create(RBRACKET247);
-            this.adaptor.addChild(root_0, RBRACKET247_tree);
+            RBRACKET246_tree = this.adaptor.create(RBRACKET246);
+            this.adaptor.addChild(root_0, RBRACKET246_tree);
             }
 
 
@@ -33435,7 +33441,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
+    // xquery/XQueryParser.g:908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
     // $ANTLR start "p_PathExpr"
     p_PathExpr: function() {
         var retval = new XQueryParser.p_PathExpr_return();
@@ -33443,39 +33449,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SLASH248 = null;
-        var SLASH250 = null;
-        var SLASH_SLASH251 = null;
-         var p_RelativePathExpr249 = null;
+        var SLASH247 = null;
+        var SLASH249 = null;
+        var SLASH_SLASH250 = null;
+         var p_RelativePathExpr248 = null;
+         var p_RelativePathExpr251 = null;
          var p_RelativePathExpr252 = null;
-         var p_RelativePathExpr253 = null;
 
-        var SLASH248_tree=null;
-        var SLASH250_tree=null;
-        var SLASH_SLASH251_tree=null;
+        var SLASH247_tree=null;
+        var SLASH249_tree=null;
+        var SLASH_SLASH250_tree=null;
 
         try {
-            // xquery/XQueryParser.g:907:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
+            // xquery/XQueryParser.g:909:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
             var alt117=4;
             alt117 = this.dfa117.predict(this.input);
             switch (alt117) {
                 case 1 :
-                    // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:907:41: ( SLASH p_RelativePathExpr )
-                    // xquery/XQueryParser.g:907:42: SLASH p_RelativePathExpr
-                    SLASH248=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6557); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:909:41: ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:42: SLASH p_RelativePathExpr
+                    SLASH247=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6561); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH248_tree = this.adaptor.create(SLASH248);
-                    this.adaptor.addChild(root_0, SLASH248_tree);
+                    SLASH247_tree = this.adaptor.create(SLASH247);
+                    this.adaptor.addChild(root_0, SLASH247_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6559);
-                    p_RelativePathExpr249=this.p_RelativePathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6563);
+                    p_RelativePathExpr248=this.p_RelativePathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr249.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr248.getTree());
 
 
 
@@ -33483,27 +33489,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:908:11: SLASH
+                    // xquery/XQueryParser.g:910:11: SLASH
                     root_0 = this.adaptor.nil();
 
-                    SLASH250=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6572); if (this.state.failed) return retval;
+                    SLASH249=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6576); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH250_tree = this.adaptor.create(SLASH250);
-                    this.adaptor.addChild(root_0, SLASH250_tree);
+                    SLASH249_tree = this.adaptor.create(SLASH249);
+                    this.adaptor.addChild(root_0, SLASH249_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:909:11: SLASH_SLASH p_RelativePathExpr
+                    // xquery/XQueryParser.g:911:11: SLASH_SLASH p_RelativePathExpr
                     root_0 = this.adaptor.nil();
 
-                    SLASH_SLASH251=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6584); if (this.state.failed) return retval;
+                    SLASH_SLASH250=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6588); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH_SLASH251_tree = this.adaptor.create(SLASH_SLASH251);
-                    this.adaptor.addChild(root_0, SLASH_SLASH251_tree);
+                    SLASH_SLASH250_tree = this.adaptor.create(SLASH_SLASH250);
+                    this.adaptor.addChild(root_0, SLASH_SLASH250_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6586);
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6590);
+                    p_RelativePathExpr251=this.p_RelativePathExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr251.getTree());
+
+
+                    break;
+                case 4 :
+                    // xquery/XQueryParser.g:912:11: p_RelativePathExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6602);
                     p_RelativePathExpr252=this.p_RelativePathExpr();
 
                     this.state._fsp--;
@@ -33511,19 +33530,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr252.getTree());
 
 
-                    break;
-                case 4 :
-                    // xquery/XQueryParser.g:910:11: p_RelativePathExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6598);
-                    p_RelativePathExpr253=this.p_RelativePathExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr253.getTree());
-
-
                     break;
 
             }
@@ -33560,7 +33566,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:914:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
+    // xquery/XQueryParser.g:916:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
     // $ANTLR start "p_RelativePathExpr"
     p_RelativePathExpr: function() {
         var retval = new XQueryParser.p_RelativePathExpr_return();
@@ -33568,24 +33574,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set255 = null;
-         var p_StepExpr254 = null;
-         var p_StepExpr256 = null;
+        var set254 = null;
+         var p_StepExpr253 = null;
+         var p_StepExpr255 = null;
 
-        var set255_tree=null;
+        var set254_tree=null;
 
         try {
-            // xquery/XQueryParser.g:915:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
-            // xquery/XQueryParser.g:915:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            // xquery/XQueryParser.g:917:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
+            // xquery/XQueryParser.g:917:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6626);
-            p_StepExpr254=this.p_StepExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6630);
+            p_StepExpr253=this.p_StepExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr254.getTree());
-            // xquery/XQueryParser.g:915:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr253.getTree());
+            // xquery/XQueryParser.g:917:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             loop118:
             do {
                 var alt118=2;
@@ -33598,11 +33604,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt118) {
                 case 1 :
-                    // xquery/XQueryParser.g:915:23: ( SLASH | SLASH_SLASH ) p_StepExpr
-                    set255=this.input.LT(1);
+                    // xquery/XQueryParser.g:917:23: ( SLASH | SLASH_SLASH ) p_StepExpr
+                    set254=this.input.LT(1);
                     if ( (this.input.LA(1)>=SLASH && this.input.LA(1)<=SLASH_SLASH) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set255));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set254));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -33611,12 +33617,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         throw mse;
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6637);
-                    p_StepExpr256=this.p_StepExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6641);
+                    p_StepExpr255=this.p_StepExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr256.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr255.getTree());
 
 
                     break;
@@ -33662,7 +33668,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
+    // xquery/XQueryParser.g:921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
     // $ANTLR start "p_StepExpr"
     p_StepExpr: function() {
         var retval = new XQueryParser.p_StepExpr_return();
@@ -33670,24 +33676,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+         var p_PostfixExpr256 = null;
          var p_PostfixExpr257 = null;
-         var p_PostfixExpr258 = null;
-         var p_AxisStep259 = null;
+         var p_AxisStep258 = null;
+         var p_PostfixExpr259 = null;
          var p_PostfixExpr260 = null;
-         var p_PostfixExpr261 = null;
-         var p_AxisStep262 = null;
+         var p_AxisStep261 = null;
 
 
         try {
-            // xquery/XQueryParser.g:920:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
+            // xquery/XQueryParser.g:922:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
             var alt119=6;
             alt119 = this.dfa119.predict(this.input);
             switch (alt119) {
                 case 1 :
-                    // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6691);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6695);
+                    p_PostfixExpr256=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr256.getTree());
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6809);
                     p_PostfixExpr257=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -33695,38 +33714,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr257.getTree());
 
 
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6805);
-                    p_PostfixExpr258=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr258.getTree());
-
-
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:926:11: ( p_KindTest )=> p_AxisStep
+                    // xquery/XQueryParser.g:928:11: ( p_KindTest )=> p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6823);
-                    p_AxisStep259=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6827);
+                    p_AxisStep258=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep259.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep258.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6844);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6848);
+                    p_PostfixExpr259=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr259.getTree());
+
+
+                    break;
+                case 5 :
+                    // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6866);
                     p_PostfixExpr260=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -33734,30 +33753,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr260.getTree());
 
 
-                    break;
-                case 5 :
-                    // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6862);
-                    p_PostfixExpr261=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr261.getTree());
-
-
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:929:11: p_AxisStep
+                    // xquery/XQueryParser.g:931:11: p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6874);
-                    p_AxisStep262=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6878);
+                    p_AxisStep261=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep262.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep261.getTree());
 
 
                     break;
@@ -33796,7 +33802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:933:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
+    // xquery/XQueryParser.g:935:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
     // $ANTLR start "p_AxisStep"
     p_AxisStep: function() {
         var retval = new XQueryParser.p_AxisStep_return();
@@ -33804,17 +33810,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseStep263 = null;
-         var p_ForwardStep264 = null;
-         var p_PredicateList265 = null;
+         var p_ReverseStep262 = null;
+         var p_ForwardStep263 = null;
+         var p_PredicateList264 = null;
 
 
         try {
-            // xquery/XQueryParser.g:934:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
+            // xquery/XQueryParser.g:936:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep )
             var alt120=2;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -34121,36 +34127,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt120) {
                 case 1 :
-                    // xquery/XQueryParser.g:934:12: p_ReverseStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6901);
-                    p_ReverseStep263=this.p_ReverseStep();
+                    // xquery/XQueryParser.g:936:12: p_ReverseStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6905);
+                    p_ReverseStep262=this.p_ReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep263.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep262.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:934:28: p_ForwardStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6905);
-                    p_ForwardStep264=this.p_ForwardStep();
+                    // xquery/XQueryParser.g:936:28: p_ForwardStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6909);
+                    p_ForwardStep263=this.p_ForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep264.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep263.getTree());
 
 
                     break;
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6908);
-            p_PredicateList265=this.p_PredicateList();
+            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6912);
+            p_PredicateList264=this.p_PredicateList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList265.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList264.getTree());
 
 
 
@@ -34187,7 +34193,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
+    // xquery/XQueryParser.g:940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
     // $ANTLR start "p_ForwardStep"
     p_ForwardStep: function() {
         var retval = new XQueryParser.p_ForwardStep_return();
@@ -34195,45 +34201,45 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ForwardAxis266 = null;
-         var p_NodeTest267 = null;
-         var p_AbbrevForwardStep268 = null;
+         var p_ForwardAxis265 = null;
+         var p_NodeTest266 = null;
+         var p_AbbrevForwardStep267 = null;
 
 
         try {
-            // xquery/XQueryParser.g:939:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
+            // xquery/XQueryParser.g:941:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
             var alt121=2;
             alt121 = this.dfa121.predict(this.input);
             switch (alt121) {
                 case 1 :
-                    // xquery/XQueryParser.g:939:11: p_ForwardAxis p_NodeTest
+                    // xquery/XQueryParser.g:941:11: p_ForwardAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6934);
-                    p_ForwardAxis266=this.p_ForwardAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6938);
+                    p_ForwardAxis265=this.p_ForwardAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis266.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6936);
-                    p_NodeTest267=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis265.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6940);
+                    p_NodeTest266=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest267.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest266.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:940:11: p_AbbrevForwardStep
+                    // xquery/XQueryParser.g:942:11: p_AbbrevForwardStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948);
-                    p_AbbrevForwardStep268=this.p_AbbrevForwardStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952);
+                    p_AbbrevForwardStep267=this.p_AbbrevForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep268.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep267.getTree());
 
 
                     break;
@@ -34272,7 +34278,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:944:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
+    // xquery/XQueryParser.g:946:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
     // $ANTLR start "p_ForwardAxis"
     p_ForwardAxis: function() {
         var retval = new XQueryParser.p_ForwardAxis_return();
@@ -34280,38 +34286,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CHILD269 = null;
-        var COLON_COLON270 = null;
-        var DESCENDANT271 = null;
-        var COLON_COLON272 = null;
-        var ATTRIBUTE273 = null;
-        var COLON_COLON274 = null;
-        var SELF275 = null;
-        var COLON_COLON276 = null;
-        var DESCENDANT_OR_SELF277 = null;
-        var COLON_COLON278 = null;
-        var FOLLOWING_SIBLING279 = null;
-        var COLON_COLON280 = null;
-        var FOLLOWING281 = null;
-        var COLON_COLON282 = null;
+        var CHILD268 = null;
+        var COLON_COLON269 = null;
+        var DESCENDANT270 = null;
+        var COLON_COLON271 = null;
+        var ATTRIBUTE272 = null;
+        var COLON_COLON273 = null;
+        var SELF274 = null;
+        var COLON_COLON275 = null;
+        var DESCENDANT_OR_SELF276 = null;
+        var COLON_COLON277 = null;
+        var FOLLOWING_SIBLING278 = null;
+        var COLON_COLON279 = null;
+        var FOLLOWING280 = null;
+        var COLON_COLON281 = null;
 
-        var CHILD269_tree=null;
-        var COLON_COLON270_tree=null;
-        var DESCENDANT271_tree=null;
-        var COLON_COLON272_tree=null;
-        var ATTRIBUTE273_tree=null;
-        var COLON_COLON274_tree=null;
-        var SELF275_tree=null;
-        var COLON_COLON276_tree=null;
-        var DESCENDANT_OR_SELF277_tree=null;
-        var COLON_COLON278_tree=null;
-        var FOLLOWING_SIBLING279_tree=null;
-        var COLON_COLON280_tree=null;
-        var FOLLOWING281_tree=null;
-        var COLON_COLON282_tree=null;
+        var CHILD268_tree=null;
+        var COLON_COLON269_tree=null;
+        var DESCENDANT270_tree=null;
+        var COLON_COLON271_tree=null;
+        var ATTRIBUTE272_tree=null;
+        var COLON_COLON273_tree=null;
+        var SELF274_tree=null;
+        var COLON_COLON275_tree=null;
+        var DESCENDANT_OR_SELF276_tree=null;
+        var COLON_COLON277_tree=null;
+        var FOLLOWING_SIBLING278_tree=null;
+        var COLON_COLON279_tree=null;
+        var FOLLOWING280_tree=null;
+        var COLON_COLON281_tree=null;
 
         try {
-            // xquery/XQueryParser.g:945:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
+            // xquery/XQueryParser.g:947:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
             var alt122=7;
             switch ( this.input.LA(1) ) {
             case CHILD:
@@ -34345,120 +34351,120 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt122) {
                 case 1 :
-                    // xquery/XQueryParser.g:945:11: CHILD COLON_COLON
+                    // xquery/XQueryParser.g:947:11: CHILD COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    CHILD269=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6974); if (this.state.failed) return retval;
+                    CHILD268=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6978); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CHILD269_tree = this.adaptor.create(CHILD269);
-                    this.adaptor.addChild(root_0, CHILD269_tree);
+                    CHILD268_tree = this.adaptor.create(CHILD268);
+                    this.adaptor.addChild(root_0, CHILD268_tree);
                     }
-                    COLON_COLON270=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6976); if (this.state.failed) return retval;
+                    COLON_COLON269=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON270_tree = this.adaptor.create(COLON_COLON270);
-                    this.adaptor.addChild(root_0, COLON_COLON270_tree);
+                    COLON_COLON269_tree = this.adaptor.create(COLON_COLON269);
+                    this.adaptor.addChild(root_0, COLON_COLON269_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:946:11: DESCENDANT COLON_COLON
+                    // xquery/XQueryParser.g:948:11: DESCENDANT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT271=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6988); if (this.state.failed) return retval;
+                    DESCENDANT270=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT271_tree = this.adaptor.create(DESCENDANT271);
-                    this.adaptor.addChild(root_0, DESCENDANT271_tree);
+                    DESCENDANT270_tree = this.adaptor.create(DESCENDANT270);
+                    this.adaptor.addChild(root_0, DESCENDANT270_tree);
                     }
-                    COLON_COLON272=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6990); if (this.state.failed) return retval;
+                    COLON_COLON271=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6994); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON272_tree = this.adaptor.create(COLON_COLON272);
-                    this.adaptor.addChild(root_0, COLON_COLON272_tree);
+                    COLON_COLON271_tree = this.adaptor.create(COLON_COLON271);
+                    this.adaptor.addChild(root_0, COLON_COLON271_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:947:11: ATTRIBUTE COLON_COLON
+                    // xquery/XQueryParser.g:949:11: ATTRIBUTE COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ATTRIBUTE273=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002); if (this.state.failed) return retval;
+                    ATTRIBUTE272=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTRIBUTE273_tree = this.adaptor.create(ATTRIBUTE273);
-                    this.adaptor.addChild(root_0, ATTRIBUTE273_tree);
+                    ATTRIBUTE272_tree = this.adaptor.create(ATTRIBUTE272);
+                    this.adaptor.addChild(root_0, ATTRIBUTE272_tree);
                     }
-                    COLON_COLON274=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7004); if (this.state.failed) return retval;
+                    COLON_COLON273=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7008); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON274_tree = this.adaptor.create(COLON_COLON274);
-                    this.adaptor.addChild(root_0, COLON_COLON274_tree);
+                    COLON_COLON273_tree = this.adaptor.create(COLON_COLON273);
+                    this.adaptor.addChild(root_0, COLON_COLON273_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:948:11: SELF COLON_COLON
+                    // xquery/XQueryParser.g:950:11: SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    SELF275=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7016); if (this.state.failed) return retval;
+                    SELF274=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7020); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SELF275_tree = this.adaptor.create(SELF275);
-                    this.adaptor.addChild(root_0, SELF275_tree);
+                    SELF274_tree = this.adaptor.create(SELF274);
+                    this.adaptor.addChild(root_0, SELF274_tree);
                     }
-                    COLON_COLON276=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7018); if (this.state.failed) return retval;
+                    COLON_COLON275=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7022); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON276_tree = this.adaptor.create(COLON_COLON276);
-                    this.adaptor.addChild(root_0, COLON_COLON276_tree);
+                    COLON_COLON275_tree = this.adaptor.create(COLON_COLON275);
+                    this.adaptor.addChild(root_0, COLON_COLON275_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:949:11: DESCENDANT_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:951:11: DESCENDANT_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT_OR_SELF277=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030); if (this.state.failed) return retval;
+                    DESCENDANT_OR_SELF276=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT_OR_SELF277_tree = this.adaptor.create(DESCENDANT_OR_SELF277);
-                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF277_tree);
+                    DESCENDANT_OR_SELF276_tree = this.adaptor.create(DESCENDANT_OR_SELF276);
+                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF276_tree);
                     }
-                    COLON_COLON278=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7032); if (this.state.failed) return retval;
+                    COLON_COLON277=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON278_tree = this.adaptor.create(COLON_COLON278);
-                    this.adaptor.addChild(root_0, COLON_COLON278_tree);
+                    COLON_COLON277_tree = this.adaptor.create(COLON_COLON277);
+                    this.adaptor.addChild(root_0, COLON_COLON277_tree);
                     }
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:950:11: FOLLOWING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:952:11: FOLLOWING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING_SIBLING279=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044); if (this.state.failed) return retval;
+                    FOLLOWING_SIBLING278=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING_SIBLING279_tree = this.adaptor.create(FOLLOWING_SIBLING279);
-                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING279_tree);
+                    FOLLOWING_SIBLING278_tree = this.adaptor.create(FOLLOWING_SIBLING278);
+                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING278_tree);
                     }
-                    COLON_COLON280=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7046); if (this.state.failed) return retval;
+                    COLON_COLON279=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7050); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON280_tree = this.adaptor.create(COLON_COLON280);
-                    this.adaptor.addChild(root_0, COLON_COLON280_tree);
+                    COLON_COLON279_tree = this.adaptor.create(COLON_COLON279);
+                    this.adaptor.addChild(root_0, COLON_COLON279_tree);
                     }
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:951:11: FOLLOWING COLON_COLON
+                    // xquery/XQueryParser.g:953:11: FOLLOWING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING281=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7058); if (this.state.failed) return retval;
+                    FOLLOWING280=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7062); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING281_tree = this.adaptor.create(FOLLOWING281);
-                    this.adaptor.addChild(root_0, FOLLOWING281_tree);
+                    FOLLOWING280_tree = this.adaptor.create(FOLLOWING280);
+                    this.adaptor.addChild(root_0, FOLLOWING280_tree);
                     }
-                    COLON_COLON282=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7060); if (this.state.failed) return retval;
+                    COLON_COLON281=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7064); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON282_tree = this.adaptor.create(COLON_COLON282);
-                    this.adaptor.addChild(root_0, COLON_COLON282_tree);
+                    COLON_COLON281_tree = this.adaptor.create(COLON_COLON281);
+                    this.adaptor.addChild(root_0, COLON_COLON281_tree);
                     }
 
 
@@ -34498,7 +34504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:955:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
+    // xquery/XQueryParser.g:957:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
     // $ANTLR start "p_AbbrevForwardStep"
     p_AbbrevForwardStep: function() {
         var retval = new XQueryParser.p_AbbrevForwardStep_return();
@@ -34506,17 +34512,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTR_SIGN283 = null;
-         var p_NodeTest284 = null;
+        var ATTR_SIGN282 = null;
+         var p_NodeTest283 = null;
 
-        var ATTR_SIGN283_tree=null;
+        var ATTR_SIGN282_tree=null;
 
         try {
-            // xquery/XQueryParser.g:956:9: ( ( ATTR_SIGN )? p_NodeTest )
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )? p_NodeTest
+            // xquery/XQueryParser.g:958:9: ( ( ATTR_SIGN )? p_NodeTest )
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )? p_NodeTest
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )?
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )?
             var alt123=2;
             var LA123_0 = this.input.LA(1);
 
@@ -34525,11 +34531,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt123) {
                 case 1 :
-                    // xquery/XQueryParser.g:956:11: ATTR_SIGN
-                    ATTR_SIGN283=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:958:11: ATTR_SIGN
+                    ATTR_SIGN282=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTR_SIGN283_tree = this.adaptor.create(ATTR_SIGN283);
-                    this.adaptor.addChild(root_0, ATTR_SIGN283_tree);
+                    ATTR_SIGN282_tree = this.adaptor.create(ATTR_SIGN282);
+                    this.adaptor.addChild(root_0, ATTR_SIGN282_tree);
                     }
 
 
@@ -34537,12 +34543,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089);
-            p_NodeTest284=this.p_NodeTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093);
+            p_NodeTest283=this.p_NodeTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest284.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest283.getTree());
 
 
 
@@ -34579,7 +34585,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:960:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
+    // xquery/XQueryParser.g:962:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
     // $ANTLR start "p_ReverseStep"
     p_ReverseStep: function() {
         var retval = new XQueryParser.p_ReverseStep_return();
@@ -34587,13 +34593,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseAxis285 = null;
-         var p_NodeTest286 = null;
-         var p_AbbrevReverseStep287 = null;
+         var p_ReverseAxis284 = null;
+         var p_NodeTest285 = null;
+         var p_AbbrevReverseStep286 = null;
 
 
         try {
-            // xquery/XQueryParser.g:961:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
+            // xquery/XQueryParser.g:963:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
             var alt124=2;
             var LA124_0 = this.input.LA(1);
 
@@ -34612,34 +34618,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt124) {
                 case 1 :
-                    // xquery/XQueryParser.g:961:11: p_ReverseAxis p_NodeTest
+                    // xquery/XQueryParser.g:963:11: p_ReverseAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7115);
-                    p_ReverseAxis285=this.p_ReverseAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7119);
+                    p_ReverseAxis284=this.p_ReverseAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis285.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7117);
-                    p_NodeTest286=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis284.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7121);
+                    p_NodeTest285=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest286.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest285.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:962:11: p_AbbrevReverseStep
+                    // xquery/XQueryParser.g:964:11: p_AbbrevReverseStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129);
-                    p_AbbrevReverseStep287=this.p_AbbrevReverseStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133);
+                    p_AbbrevReverseStep286=this.p_AbbrevReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep287.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep286.getTree());
 
 
                     break;
@@ -34678,7 +34684,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:966:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
+    // xquery/XQueryParser.g:968:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
     // $ANTLR start "p_ReverseAxis"
     p_ReverseAxis: function() {
         var retval = new XQueryParser.p_ReverseAxis_return();
@@ -34686,30 +34692,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PARENT288 = null;
-        var COLON_COLON289 = null;
-        var ANCESTOR290 = null;
-        var COLON_COLON291 = null;
-        var PRECEDING_SIBLING292 = null;
-        var COLON_COLON293 = null;
-        var PRECEDING294 = null;
-        var COLON_COLON295 = null;
-        var ANCESTOR_OR_SELF296 = null;
-        var COLON_COLON297 = null;
+        var PARENT287 = null;
+        var COLON_COLON288 = null;
+        var ANCESTOR289 = null;
+        var COLON_COLON290 = null;
+        var PRECEDING_SIBLING291 = null;
+        var COLON_COLON292 = null;
+        var PRECEDING293 = null;
+        var COLON_COLON294 = null;
+        var ANCESTOR_OR_SELF295 = null;
+        var COLON_COLON296 = null;
 
-        var PARENT288_tree=null;
-        var COLON_COLON289_tree=null;
-        var ANCESTOR290_tree=null;
-        var COLON_COLON291_tree=null;
-        var PRECEDING_SIBLING292_tree=null;
-        var COLON_COLON293_tree=null;
-        var PRECEDING294_tree=null;
-        var COLON_COLON295_tree=null;
-        var ANCESTOR_OR_SELF296_tree=null;
-        var COLON_COLON297_tree=null;
+        var PARENT287_tree=null;
+        var COLON_COLON288_tree=null;
+        var ANCESTOR289_tree=null;
+        var COLON_COLON290_tree=null;
+        var PRECEDING_SIBLING291_tree=null;
+        var COLON_COLON292_tree=null;
+        var PRECEDING293_tree=null;
+        var COLON_COLON294_tree=null;
+        var ANCESTOR_OR_SELF295_tree=null;
+        var COLON_COLON296_tree=null;
 
         try {
-            // xquery/XQueryParser.g:967:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
+            // xquery/XQueryParser.g:969:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
             var alt125=5;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -34737,86 +34743,86 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt125) {
                 case 1 :
-                    // xquery/XQueryParser.g:967:11: PARENT COLON_COLON
+                    // xquery/XQueryParser.g:969:11: PARENT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PARENT288=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7155); if (this.state.failed) return retval;
+                    PARENT287=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7159); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PARENT288_tree = this.adaptor.create(PARENT288);
-                    this.adaptor.addChild(root_0, PARENT288_tree);
+                    PARENT287_tree = this.adaptor.create(PARENT287);
+                    this.adaptor.addChild(root_0, PARENT287_tree);
                     }
-                    COLON_COLON289=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7157); if (this.state.failed) return retval;
+                    COLON_COLON288=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON289_tree = this.adaptor.create(COLON_COLON289);
-                    this.adaptor.addChild(root_0, COLON_COLON289_tree);
+                    COLON_COLON288_tree = this.adaptor.create(COLON_COLON288);
+                    this.adaptor.addChild(root_0, COLON_COLON288_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:968:11: ANCESTOR COLON_COLON
+                    // xquery/XQueryParser.g:970:11: ANCESTOR COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR290=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7169); if (this.state.failed) return retval;
+                    ANCESTOR289=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7173); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR290_tree = this.adaptor.create(ANCESTOR290);
-                    this.adaptor.addChild(root_0, ANCESTOR290_tree);
+                    ANCESTOR289_tree = this.adaptor.create(ANCESTOR289);
+                    this.adaptor.addChild(root_0, ANCESTOR289_tree);
                     }
-                    COLON_COLON291=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7171); if (this.state.failed) return retval;
+                    COLON_COLON290=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON291_tree = this.adaptor.create(COLON_COLON291);
-                    this.adaptor.addChild(root_0, COLON_COLON291_tree);
+                    COLON_COLON290_tree = this.adaptor.create(COLON_COLON290);
+                    this.adaptor.addChild(root_0, COLON_COLON290_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:969:11: PRECEDING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:971:11: PRECEDING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING_SIBLING292=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183); if (this.state.failed) return retval;
+                    PRECEDING_SIBLING291=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING_SIBLING292_tree = this.adaptor.create(PRECEDING_SIBLING292);
-                    this.adaptor.addChild(root_0, PRECEDING_SIBLING292_tree);
+                    PRECEDING_SIBLING291_tree = this.adaptor.create(PRECEDING_SIBLING291);
+                    this.adaptor.addChild(root_0, PRECEDING_SIBLING291_tree);
                     }
-                    COLON_COLON293=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7185); if (this.state.failed) return retval;
+                    COLON_COLON292=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7189); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON293_tree = this.adaptor.create(COLON_COLON293);
-                    this.adaptor.addChild(root_0, COLON_COLON293_tree);
+                    COLON_COLON292_tree = this.adaptor.create(COLON_COLON292);
+                    this.adaptor.addChild(root_0, COLON_COLON292_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:970:11: PRECEDING COLON_COLON
+                    // xquery/XQueryParser.g:972:11: PRECEDING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING294=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7197); if (this.state.failed) return retval;
+                    PRECEDING293=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING294_tree = this.adaptor.create(PRECEDING294);
-                    this.adaptor.addChild(root_0, PRECEDING294_tree);
+                    PRECEDING293_tree = this.adaptor.create(PRECEDING293);
+                    this.adaptor.addChild(root_0, PRECEDING293_tree);
                     }
-                    COLON_COLON295=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7199); if (this.state.failed) return retval;
+                    COLON_COLON294=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7203); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON295_tree = this.adaptor.create(COLON_COLON295);
-                    this.adaptor.addChild(root_0, COLON_COLON295_tree);
+                    COLON_COLON294_tree = this.adaptor.create(COLON_COLON294);
+                    this.adaptor.addChild(root_0, COLON_COLON294_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:971:11: ANCESTOR_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:973:11: ANCESTOR_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR_OR_SELF296=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211); if (this.state.failed) return retval;
+                    ANCESTOR_OR_SELF295=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR_OR_SELF296_tree = this.adaptor.create(ANCESTOR_OR_SELF296);
-                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF296_tree);
+                    ANCESTOR_OR_SELF295_tree = this.adaptor.create(ANCESTOR_OR_SELF295);
+                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF295_tree);
                     }
-                    COLON_COLON297=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7213); if (this.state.failed) return retval;
+                    COLON_COLON296=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7217); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON297_tree = this.adaptor.create(COLON_COLON297);
-                    this.adaptor.addChild(root_0, COLON_COLON297_tree);
+                    COLON_COLON296_tree = this.adaptor.create(COLON_COLON296);
+                    this.adaptor.addChild(root_0, COLON_COLON296_tree);
                     }
 
 
@@ -34856,7 +34862,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:975:1: p_AbbrevReverseStep : DOT_DOT ;
+    // xquery/XQueryParser.g:977:1: p_AbbrevReverseStep : DOT_DOT ;
     // $ANTLR start "p_AbbrevReverseStep"
     p_AbbrevReverseStep: function() {
         var retval = new XQueryParser.p_AbbrevReverseStep_return();
@@ -34864,19 +34870,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT_DOT298 = null;
+        var DOT_DOT297 = null;
 
-        var DOT_DOT298_tree=null;
+        var DOT_DOT297_tree=null;
 
         try {
-            // xquery/XQueryParser.g:976:9: ( DOT_DOT )
-            // xquery/XQueryParser.g:976:11: DOT_DOT
+            // xquery/XQueryParser.g:978:9: ( DOT_DOT )
+            // xquery/XQueryParser.g:978:11: DOT_DOT
             root_0 = this.adaptor.nil();
 
-            DOT_DOT298=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239); if (this.state.failed) return retval;
+            DOT_DOT297=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT_DOT298_tree = this.adaptor.create(DOT_DOT298);
-            this.adaptor.addChild(root_0, DOT_DOT298_tree);
+            DOT_DOT297_tree = this.adaptor.create(DOT_DOT297);
+            this.adaptor.addChild(root_0, DOT_DOT297_tree);
             }
 
 
@@ -34914,7 +34920,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:980:1: p_NodeTest : ( p_KindTest | p_NameTest );
+    // xquery/XQueryParser.g:982:1: p_NodeTest : ( p_KindTest | p_NameTest );
     // $ANTLR start "p_NodeTest"
     p_NodeTest: function() {
         var retval = new XQueryParser.p_NodeTest_return();
@@ -34922,38 +34928,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_KindTest299 = null;
-         var p_NameTest300 = null;
+         var p_KindTest298 = null;
+         var p_NameTest299 = null;
 
 
         try {
-            // xquery/XQueryParser.g:981:9: ( p_KindTest | p_NameTest )
+            // xquery/XQueryParser.g:983:9: ( p_KindTest | p_NameTest )
             var alt126=2;
             alt126 = this.dfa126.predict(this.input);
             switch (alt126) {
                 case 1 :
-                    // xquery/XQueryParser.g:981:11: p_KindTest
+                    // xquery/XQueryParser.g:983:11: p_KindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7265);
-                    p_KindTest299=this.p_KindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7269);
+                    p_KindTest298=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest299.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest298.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:981:24: p_NameTest
+                    // xquery/XQueryParser.g:983:24: p_NameTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7269);
-                    p_NameTest300=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7273);
+                    p_NameTest299=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest300.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest299.getTree());
 
 
                     break;
@@ -34992,7 +34998,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:985:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
+    // xquery/XQueryParser.g:987:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
     // $ANTLR start "p_NameTest"
     p_NameTest: function() {
         var retval = new XQueryParser.p_NameTest_return();
@@ -35000,13 +35006,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Wildcard301 = null;
+         var p_Wildcard300 = null;
+         var p_QName301 = null;
          var p_QName302 = null;
-         var p_QName303 = null;
 
 
         try {
-            // xquery/XQueryParser.g:986:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
+            // xquery/XQueryParser.g:988:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
             var alt127=3;
             var LA127_0 = this.input.LA(1);
 
@@ -35048,23 +35054,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt127) {
                 case 1 :
-                    // xquery/XQueryParser.g:986:11: ( p_Wildcard )=> p_Wildcard
+                    // xquery/XQueryParser.g:988:11: ( p_Wildcard )=> p_Wildcard
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7301);
-                    p_Wildcard301=this.p_Wildcard();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7305);
+                    p_Wildcard300=this.p_Wildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard301.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard300.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:987:11: ( p_NCName COLON )=> p_QName
+                    // xquery/XQueryParser.g:989:11: ( p_NCName COLON )=> p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7322);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7326);
+                    p_QName301=this.p_QName();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName301.getTree());
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:990:11: ( p_NCName )=> p_QName
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7344);
                     p_QName302=this.p_QName();
 
                     this.state._fsp--;
@@ -35072,19 +35091,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName302.getTree());
 
 
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:988:11: ( p_NCName )=> p_QName
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7340);
-                    p_QName303=this.p_QName();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName303.getTree());
-
-
                     break;
 
             }
@@ -35121,7 +35127,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:992:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
+    // xquery/XQueryParser.g:994:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
     // $ANTLR start "p_Wildcard"
     p_Wildcard: function() {
         var retval = new XQueryParser.p_Wildcard_return();
@@ -35129,26 +35135,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR304 = null;
-        var COLON305 = null;
-        var COLON308 = null;
-        var STAR309 = null;
-        var COLON311 = null;
-        var STAR312 = null;
+        var STAR303 = null;
+        var COLON304 = null;
+        var COLON307 = null;
+        var STAR308 = null;
+        var COLON310 = null;
+        var STAR311 = null;
+         var p_NCName305 = null;
          var p_NCName306 = null;
-         var p_NCName307 = null;
-         var p_StringLiteral310 = null;
+         var p_StringLiteral309 = null;
 
-        var STAR304_tree=null;
-        var COLON305_tree=null;
-        var COLON308_tree=null;
-        var STAR309_tree=null;
-        var COLON311_tree=null;
-        var STAR312_tree=null;
+        var STAR303_tree=null;
+        var COLON304_tree=null;
+        var COLON307_tree=null;
+        var STAR308_tree=null;
+        var COLON310_tree=null;
+        var STAR311_tree=null;
 
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:993:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
+            // xquery/XQueryParser.g:995:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
             var alt129=3;
             switch ( this.input.LA(1) ) {
             case STAR:
@@ -35375,15 +35381,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt129) {
                 case 1 :
-                    // xquery/XQueryParser.g:993:11: STAR ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:11: STAR ( COLON p_NCName )?
                     root_0 = this.adaptor.nil();
 
-                    STAR304=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7370); if (this.state.failed) return retval;
+                    STAR303=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR304_tree = this.adaptor.create(STAR304);
-                    this.adaptor.addChild(root_0, STAR304_tree);
+                    STAR303_tree = this.adaptor.create(STAR303);
+                    this.adaptor.addChild(root_0, STAR303_tree);
                     }
-                    // xquery/XQueryParser.g:993:16: ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:16: ( COLON p_NCName )?
                     var alt128=2;
                     var LA128_0 = this.input.LA(1);
 
@@ -35392,18 +35398,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt128) {
                         case 1 :
-                            // xquery/XQueryParser.g:993:17: COLON p_NCName
-                            COLON305=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7373); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:995:17: COLON p_NCName
+                            COLON304=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7377); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COLON305_tree = this.adaptor.create(COLON305);
-                            this.adaptor.addChild(root_0, COLON305_tree);
+                            COLON304_tree = this.adaptor.create(COLON304);
+                            this.adaptor.addChild(root_0, COLON304_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7375);
-                            p_NCName306=this.p_NCName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7379);
+                            p_NCName305=this.p_NCName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName305.getTree());
 
 
                             break;
@@ -35414,47 +35420,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:994:11: p_NCName COLON STAR
+                    // xquery/XQueryParser.g:996:11: p_NCName COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7389);
-                    p_NCName307=this.p_NCName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7393);
+                    p_NCName306=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName307.getTree());
-                    COLON308=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7391); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                    COLON307=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7395); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON308_tree = this.adaptor.create(COLON308);
-                    this.adaptor.addChild(root_0, COLON308_tree);
+                    COLON307_tree = this.adaptor.create(COLON307);
+                    this.adaptor.addChild(root_0, COLON307_tree);
                     }
-                    STAR309=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7393); if (this.state.failed) return retval;
+                    STAR308=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7397); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR309_tree = this.adaptor.create(STAR309);
-                    this.adaptor.addChild(root_0, STAR309_tree);
+                    STAR308_tree = this.adaptor.create(STAR308);
+                    this.adaptor.addChild(root_0, STAR308_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:995:11: p_StringLiteral COLON STAR
+                    // xquery/XQueryParser.g:997:11: p_StringLiteral COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7405);
-                    p_StringLiteral310=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7409);
+                    p_StringLiteral309=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral310.getTree());
-                    COLON311=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7407); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral309.getTree());
+                    COLON310=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7411); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON311_tree = this.adaptor.create(COLON311);
-                    this.adaptor.addChild(root_0, COLON311_tree);
+                    COLON310_tree = this.adaptor.create(COLON310);
+                    this.adaptor.addChild(root_0, COLON310_tree);
                     }
-                    STAR312=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7409); if (this.state.failed) return retval;
+                    STAR311=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7413); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR312_tree = this.adaptor.create(STAR312);
-                    this.adaptor.addChild(root_0, STAR312_tree);
+                    STAR311_tree = this.adaptor.create(STAR311);
+                    this.adaptor.addChild(root_0, STAR311_tree);
                     }
 
 
@@ -35495,7 +35501,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1000:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1002:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
     // $ANTLR start "p_PostfixExpr"
     p_PostfixExpr: function() {
         var retval = new XQueryParser.p_PostfixExpr_return();
@@ -35503,22 +35509,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PrimaryExpr313 = null;
-         var p_Predicate314 = null;
+         var p_PrimaryExpr312 = null;
+         var p_Predicate313 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1001:9: ( p_PrimaryExpr ( p_Predicate )* )
-            // xquery/XQueryParser.g:1001:11: p_PrimaryExpr ( p_Predicate )*
+            // xquery/XQueryParser.g:1003:9: ( p_PrimaryExpr ( p_Predicate )* )
+            // xquery/XQueryParser.g:1003:11: p_PrimaryExpr ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447);
-            p_PrimaryExpr313=this.p_PrimaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451);
+            p_PrimaryExpr312=this.p_PrimaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr313.getTree());
-            // xquery/XQueryParser.g:1001:25: ( p_Predicate )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr312.getTree());
+            // xquery/XQueryParser.g:1003:25: ( p_Predicate )*
             loop130:
             do {
                 var alt130=2;
@@ -35531,13 +35537,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt130) {
                 case 1 :
-                    // xquery/XQueryParser.g:1001:26: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7450);
-                    p_Predicate314=this.p_Predicate();
+                    // xquery/XQueryParser.g:1003:26: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7454);
+                    p_Predicate313=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate314.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate313.getTree());
 
 
                     break;
@@ -35583,7 +35589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1008:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
+    // xquery/XQueryParser.g:1010:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
     // $ANTLR start "p_ArgumentList"
     p_ArgumentList: function() {
         var retval = new XQueryParser.p_ArgumentList_return();
@@ -35591,27 +35597,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN315 = null;
-        var COMMA317 = null;
-        var RPAREN319 = null;
-         var p_Argument316 = null;
-         var p_Argument318 = null;
+        var LPAREN314 = null;
+        var COMMA316 = null;
+        var RPAREN318 = null;
+         var p_Argument315 = null;
+         var p_Argument317 = null;
 
-        var LPAREN315_tree=null;
-        var COMMA317_tree=null;
-        var RPAREN319_tree=null;
+        var LPAREN314_tree=null;
+        var COMMA316_tree=null;
+        var RPAREN318_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1009:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
-            // xquery/XQueryParser.g:1009:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
+            // xquery/XQueryParser.g:1011:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
+            // xquery/XQueryParser.g:1011:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN315=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7491); if (this.state.failed) return retval;
+            LPAREN314=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7495); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN315_tree = this.adaptor.create(LPAREN315);
-            this.adaptor.addChild(root_0, LPAREN315_tree);
+            LPAREN314_tree = this.adaptor.create(LPAREN314);
+            this.adaptor.addChild(root_0, LPAREN314_tree);
             }
-            // xquery/XQueryParser.g:1009:18: ( p_Argument ( COMMA p_Argument )* )?
+            // xquery/XQueryParser.g:1011:18: ( p_Argument ( COMMA p_Argument )* )?
             var alt132=2;
             var LA132_0 = this.input.LA(1);
 
@@ -35620,14 +35626,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt132) {
                 case 1 :
-                    // xquery/XQueryParser.g:1009:19: p_Argument ( COMMA p_Argument )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7494);
-                    p_Argument316=this.p_Argument();
+                    // xquery/XQueryParser.g:1011:19: p_Argument ( COMMA p_Argument )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7498);
+                    p_Argument315=this.p_Argument();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument316.getTree());
-                    // xquery/XQueryParser.g:1009:30: ( COMMA p_Argument )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument315.getTree());
+                    // xquery/XQueryParser.g:1011:30: ( COMMA p_Argument )*
                     loop131:
                     do {
                         var alt131=2;
@@ -35640,18 +35646,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt131) {
                         case 1 :
-                            // xquery/XQueryParser.g:1009:31: COMMA p_Argument
-                            COMMA317=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7497); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1011:31: COMMA p_Argument
+                            COMMA316=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7501); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA317_tree = this.adaptor.create(COMMA317);
-                            this.adaptor.addChild(root_0, COMMA317_tree);
+                            COMMA316_tree = this.adaptor.create(COMMA316);
+                            this.adaptor.addChild(root_0, COMMA316_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7499);
-                            p_Argument318=this.p_Argument();
+                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7503);
+                            p_Argument317=this.p_Argument();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument318.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument317.getTree());
 
 
                             break;
@@ -35667,10 +35673,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN319=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7505); if (this.state.failed) return retval;
+            RPAREN318=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN319_tree = this.adaptor.create(RPAREN319);
-            this.adaptor.addChild(root_0, RPAREN319_tree);
+            RPAREN318_tree = this.adaptor.create(RPAREN318);
+            this.adaptor.addChild(root_0, RPAREN318_tree);
             }
 
 
@@ -35708,7 +35714,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1013:1: p_PredicateList : ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1015:1: p_PredicateList : ( p_Predicate )* ;
     // $ANTLR start "p_PredicateList"
     p_PredicateList: function() {
         var retval = new XQueryParser.p_PredicateList_return();
@@ -35716,15 +35722,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Predicate320 = null;
+         var p_Predicate319 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1014:9: ( ( p_Predicate )* )
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:9: ( ( p_Predicate )* )
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             loop133:
             do {
                 var alt133=2;
@@ -35737,13 +35743,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt133) {
                 case 1 :
-                    // xquery/XQueryParser.g:1014:11: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7531);
-                    p_Predicate320=this.p_Predicate();
+                    // xquery/XQueryParser.g:1016:11: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7535);
+                    p_Predicate319=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate320.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate319.getTree());
 
 
                     break;
@@ -35789,7 +35795,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1018:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
+    // xquery/XQueryParser.g:1020:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
     // $ANTLR start "p_Predicate"
     p_Predicate: function() {
         var retval = new XQueryParser.p_Predicate_return();
@@ -35797,33 +35803,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LSQUARE321 = null;
-        var RSQUARE323 = null;
-         var p_Expr322 = null;
+        var LSQUARE320 = null;
+        var RSQUARE322 = null;
+         var p_Expr321 = null;
 
-        var LSQUARE321_tree=null;
-        var RSQUARE323_tree=null;
+        var LSQUARE320_tree=null;
+        var RSQUARE322_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1019:9: ( LSQUARE p_Expr[true,true] RSQUARE )
-            // xquery/XQueryParser.g:1019:11: LSQUARE p_Expr[true,true] RSQUARE
+            // xquery/XQueryParser.g:1021:9: ( LSQUARE p_Expr[true,true] RSQUARE )
+            // xquery/XQueryParser.g:1021:11: LSQUARE p_Expr[true,true] RSQUARE
             root_0 = this.adaptor.nil();
 
-            LSQUARE321=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7558); if (this.state.failed) return retval;
+            LSQUARE320=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7562); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LSQUARE321_tree = this.adaptor.create(LSQUARE321);
-            this.adaptor.addChild(root_0, LSQUARE321_tree);
+            LSQUARE320_tree = this.adaptor.create(LSQUARE320);
+            this.adaptor.addChild(root_0, LSQUARE320_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7560);
-            p_Expr322=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7564);
+            p_Expr321=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr322.getTree());
-            RSQUARE323=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7563); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr321.getTree());
+            RSQUARE322=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7567); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RSQUARE323_tree = this.adaptor.create(RSQUARE323);
-            this.adaptor.addChild(root_0, RSQUARE323_tree);
+            RSQUARE322_tree = this.adaptor.create(RSQUARE322);
+            this.adaptor.addChild(root_0, RSQUARE322_tree);
             }
 
 
@@ -35861,7 +35867,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
+    // xquery/XQueryParser.g:1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
     // $ANTLR start "p_PrimaryExpr"
     p_PrimaryExpr: function() {
         var retval = new XQueryParser.p_PrimaryExpr_return();
@@ -35869,136 +35875,136 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ParenthesizedExpr324 = null;
-         var p_Literal325 = null;
-         var p_VarRef326 = null;
-         var p_ContextItemExpr327 = null;
-         var p_FunctionCall328 = null;
-         var p_OrderedExpr329 = null;
-         var p_UnorderedExpr330 = null;
-         var p_Constructor331 = null;
-         var p_BlockExpr332 = null;
+         var p_ParenthesizedExpr323 = null;
+         var p_Literal324 = null;
+         var p_VarRef325 = null;
+         var p_ContextItemExpr326 = null;
+         var p_FunctionCall327 = null;
+         var p_OrderedExpr328 = null;
+         var p_UnorderedExpr329 = null;
+         var p_Constructor330 = null;
+         var p_BlockExpr331 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1025:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
+            // xquery/XQueryParser.g:1027:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
             var alt134=9;
             alt134 = this.dfa134.predict(this.input);
             switch (alt134) {
                 case 1 :
-                    // xquery/XQueryParser.g:1025:11: ( LPAREN )=> p_ParenthesizedExpr
+                    // xquery/XQueryParser.g:1027:11: ( LPAREN )=> p_ParenthesizedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596);
-                    p_ParenthesizedExpr324=this.p_ParenthesizedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600);
+                    p_ParenthesizedExpr323=this.p_ParenthesizedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr324.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr323.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1026:11: p_Literal
+                    // xquery/XQueryParser.g:1028:11: p_Literal
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7608);
-                    p_Literal325=this.p_Literal();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7612);
+                    p_Literal324=this.p_Literal();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal325.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal324.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1027:11: p_VarRef
+                    // xquery/XQueryParser.g:1029:11: p_VarRef
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7620);
-                    p_VarRef326=this.p_VarRef();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7624);
+                    p_VarRef325=this.p_VarRef();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef326.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef325.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1028:11: p_ContextItemExpr
+                    // xquery/XQueryParser.g:1030:11: p_ContextItemExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632);
-                    p_ContextItemExpr327=this.p_ContextItemExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636);
+                    p_ContextItemExpr326=this.p_ContextItemExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr327.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr326.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1029:11: p_FunctionCall
+                    // xquery/XQueryParser.g:1031:11: p_FunctionCall
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644);
-                    p_FunctionCall328=this.p_FunctionCall();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648);
+                    p_FunctionCall327=this.p_FunctionCall();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall328.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall327.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1030:11: p_OrderedExpr
+                    // xquery/XQueryParser.g:1032:11: p_OrderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656);
-                    p_OrderedExpr329=this.p_OrderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660);
+                    p_OrderedExpr328=this.p_OrderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr329.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr328.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1031:11: p_UnorderedExpr
+                    // xquery/XQueryParser.g:1033:11: p_UnorderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668);
-                    p_UnorderedExpr330=this.p_UnorderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672);
+                    p_UnorderedExpr329=this.p_UnorderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr330.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr329.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1032:11: p_Constructor
+                    // xquery/XQueryParser.g:1034:11: p_Constructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7680);
-                    p_Constructor331=this.p_Constructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7684);
+                    p_Constructor330=this.p_Constructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor331.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor330.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1035:11: p_BlockExpr
+                    // xquery/XQueryParser.g:1037:11: p_BlockExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694);
-                    p_BlockExpr332=this.p_BlockExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698);
+                    p_BlockExpr331=this.p_BlockExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr332.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr331.getTree());
 
 
                     break;
@@ -36037,7 +36043,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1039:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
+    // xquery/XQueryParser.g:1041:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
     // $ANTLR start "p_Literal"
     p_Literal: function() {
         var retval = new XQueryParser.p_Literal_return();
@@ -36045,12 +36051,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NumericLiteral333 = null;
-         var p_StringLiteral334 = null;
+         var p_NumericLiteral332 = null;
+         var p_StringLiteral333 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1040:9: ( p_NumericLiteral | p_StringLiteral )
+            // xquery/XQueryParser.g:1042:9: ( p_NumericLiteral | p_StringLiteral )
             var alt135=2;
             var LA135_0 = this.input.LA(1);
 
@@ -36069,28 +36075,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt135) {
                 case 1 :
-                    // xquery/XQueryParser.g:1040:11: p_NumericLiteral
+                    // xquery/XQueryParser.g:1042:11: p_NumericLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7720);
-                    p_NumericLiteral333=this.p_NumericLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7724);
+                    p_NumericLiteral332=this.p_NumericLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral333.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral332.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1040:30: p_StringLiteral
+                    // xquery/XQueryParser.g:1042:30: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7724);
-                    p_StringLiteral334=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7728);
+                    p_StringLiteral333=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral334.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral333.getTree());
 
 
                     break;
@@ -36129,7 +36135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1044:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
+    // xquery/XQueryParser.g:1046:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
     // $ANTLR start "p_NumericLiteral"
     p_NumericLiteral: function() {
         var retval = new XQueryParser.p_NumericLiteral_return();
@@ -36143,7 +36149,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1045:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
+            // xquery/XQueryParser.g:1047:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
             var alt136=3;
             switch ( this.input.LA(1) ) {
             case L_IntegerLiteral:
@@ -36165,10 +36171,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt136) {
                 case 1 :
-                    // xquery/XQueryParser.g:1045:11: d+= L_IntegerLiteral
+                    // xquery/XQueryParser.g:1047:11: d+= L_IntegerLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36183,10 +36189,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1045:48: d+= L_DecimalLiteral
+                    // xquery/XQueryParser.g:1047:48: d+= L_DecimalLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36201,10 +36207,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1045:85: d+= L_DoubleLiteral
+                    // xquery/XQueryParser.g:1047:85: d+= L_DoubleLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36253,7 +36259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1049:1: p_VarRef : d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1051:1: p_VarRef : d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_VarRef"
     p_VarRef: function() {
         var retval = new XQueryParser.p_VarRef_return();
@@ -36267,16 +36273,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1050:9: (d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1050:11: d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1052:9: (d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1052:11: d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7806); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7810); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7810);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7814);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -36321,7 +36327,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1054:1: p_VarName : p_QName ;
+    // xquery/XQueryParser.g:1056:1: p_VarName : p_QName ;
     // $ANTLR start "p_VarName"
     p_VarName: function() {
         var retval = new XQueryParser.p_VarName_return();
@@ -36329,20 +36335,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName335 = null;
+         var p_QName334 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1055:9: ( p_QName )
-            // xquery/XQueryParser.g:1055:11: p_QName
+            // xquery/XQueryParser.g:1057:9: ( p_QName )
+            // xquery/XQueryParser.g:1057:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7838);
-            p_QName335=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7842);
+            p_QName334=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName335.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName334.getTree());
 
 
 
@@ -36379,7 +36385,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1059:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
+    // xquery/XQueryParser.g:1061:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
     // $ANTLR start "p_ParenthesizedExpr"
     p_ParenthesizedExpr: function() {
         var retval = new XQueryParser.p_ParenthesizedExpr_return();
@@ -36387,24 +36393,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN336 = null;
-        var RPAREN338 = null;
-         var p_Expr337 = null;
+        var LPAREN335 = null;
+        var RPAREN337 = null;
+         var p_Expr336 = null;
 
-        var LPAREN336_tree=null;
-        var RPAREN338_tree=null;
+        var LPAREN335_tree=null;
+        var RPAREN337_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1060:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
-            // xquery/XQueryParser.g:1060:11: LPAREN ( p_Expr[true,true] )? RPAREN
+            // xquery/XQueryParser.g:1062:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
+            // xquery/XQueryParser.g:1062:11: LPAREN ( p_Expr[true,true] )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN336=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7864); if (this.state.failed) return retval;
+            LPAREN335=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7868); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN336_tree = this.adaptor.create(LPAREN336);
-            this.adaptor.addChild(root_0, LPAREN336_tree);
+            LPAREN335_tree = this.adaptor.create(LPAREN335);
+            this.adaptor.addChild(root_0, LPAREN335_tree);
             }
-            // xquery/XQueryParser.g:1060:18: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:1062:18: ( p_Expr[true,true] )?
             var alt137=2;
             var LA137_0 = this.input.LA(1);
 
@@ -36413,23 +36419,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt137) {
                 case 1 :
-                    // xquery/XQueryParser.g:1060:18: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7866);
-                    p_Expr337=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:1062:18: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7870);
+                    p_Expr336=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr337.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr336.getTree());
 
 
                     break;
 
             }
 
-            RPAREN338=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7870); if (this.state.failed) return retval;
+            RPAREN337=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7874); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN338_tree = this.adaptor.create(RPAREN338);
-            this.adaptor.addChild(root_0, RPAREN338_tree);
+            RPAREN337_tree = this.adaptor.create(RPAREN337);
+            this.adaptor.addChild(root_0, RPAREN337_tree);
             }
 
 
@@ -36467,7 +36473,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1064:1: p_ContextItemExpr : DOT ;
+    // xquery/XQueryParser.g:1066:1: p_ContextItemExpr : DOT ;
     // $ANTLR start "p_ContextItemExpr"
     p_ContextItemExpr: function() {
         var retval = new XQueryParser.p_ContextItemExpr_return();
@@ -36475,19 +36481,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT339 = null;
+        var DOT338 = null;
 
-        var DOT339_tree=null;
+        var DOT338_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1065:9: ( DOT )
-            // xquery/XQueryParser.g:1065:11: DOT
+            // xquery/XQueryParser.g:1067:9: ( DOT )
+            // xquery/XQueryParser.g:1067:11: DOT
             root_0 = this.adaptor.nil();
 
-            DOT339=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7896); if (this.state.failed) return retval;
+            DOT338=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT339_tree = this.adaptor.create(DOT339);
-            this.adaptor.addChild(root_0, DOT339_tree);
+            DOT338_tree = this.adaptor.create(DOT338);
+            this.adaptor.addChild(root_0, DOT338_tree);
             }
 
 
@@ -36525,7 +36531,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1069:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1071:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_OrderedExpr"
     p_OrderedExpr: function() {
         var retval = new XQueryParser.p_OrderedExpr_return();
@@ -36534,20 +36540,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET340 = null;
-        var RBRACKET342 = null;
-         var p_Expr341 = null;
+        var LBRACKET339 = null;
+        var RBRACKET341 = null;
+         var p_Expr340 = null;
 
         var k_tree=null;
-        var LBRACKET340_tree=null;
-        var RBRACKET342_tree=null;
+        var LBRACKET339_tree=null;
+        var RBRACKET341_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1070:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1070:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1072:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1072:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7924); if (this.state.failed) return retval;
+            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7928); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -36555,21 +36561,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET340=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7928); if (this.state.failed) return retval;
+            LBRACKET339=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7932); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET340_tree = this.adaptor.create(LBRACKET340);
-            this.adaptor.addChild(root_0, LBRACKET340_tree);
+            LBRACKET339_tree = this.adaptor.create(LBRACKET339);
+            this.adaptor.addChild(root_0, LBRACKET339_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7930);
-            p_Expr341=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7934);
+            p_Expr340=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr341.getTree());
-            RBRACKET342=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7933); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr340.getTree());
+            RBRACKET341=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET342_tree = this.adaptor.create(RBRACKET342);
-            this.adaptor.addChild(root_0, RBRACKET342_tree);
+            RBRACKET341_tree = this.adaptor.create(RBRACKET341);
+            this.adaptor.addChild(root_0, RBRACKET341_tree);
             }
 
 
@@ -36607,7 +36613,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1074:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1076:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_UnorderedExpr"
     p_UnorderedExpr: function() {
         var retval = new XQueryParser.p_UnorderedExpr_return();
@@ -36616,20 +36622,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET343 = null;
-        var RBRACKET345 = null;
-         var p_Expr344 = null;
+        var LBRACKET342 = null;
+        var RBRACKET344 = null;
+         var p_Expr343 = null;
 
         var k_tree=null;
-        var LBRACKET343_tree=null;
-        var RBRACKET345_tree=null;
+        var LBRACKET342_tree=null;
+        var RBRACKET344_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1075:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1075:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1077:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1077:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7961); if (this.state.failed) return retval;
+            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -36637,21 +36643,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET343=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
+            LBRACKET342=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7969); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET343_tree = this.adaptor.create(LBRACKET343);
-            this.adaptor.addChild(root_0, LBRACKET343_tree);
+            LBRACKET342_tree = this.adaptor.create(LBRACKET342);
+            this.adaptor.addChild(root_0, LBRACKET342_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7967);
-            p_Expr344=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7971);
+            p_Expr343=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr344.getTree());
-            RBRACKET345=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7970); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr343.getTree());
+            RBRACKET344=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7974); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET345_tree = this.adaptor.create(RBRACKET345);
-            this.adaptor.addChild(root_0, RBRACKET345_tree);
+            RBRACKET344_tree = this.adaptor.create(RBRACKET344);
+            this.adaptor.addChild(root_0, RBRACKET344_tree);
             }
 
 
@@ -36689,7 +36695,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1080:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
+    // xquery/XQueryParser.g:1082:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
     // $ANTLR start "p_FunctionCall"
     p_FunctionCall: function() {
         var retval = new XQueryParser.p_FunctionCall_return();
@@ -36698,15 +36704,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
          var f = null;
-         var p_ArgumentList346 = null;
+         var p_ArgumentList345 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1081:9: (f= pg_FQName p_ArgumentList )
-            // xquery/XQueryParser.g:1081:11: f= pg_FQName p_ArgumentList
+            // xquery/XQueryParser.g:1083:9: (f= pg_FQName p_ArgumentList )
+            // xquery/XQueryParser.g:1083:11: f= pg_FQName p_ArgumentList
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall7999);
+            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall8003);
             f=this.pg_FQName();
 
             this.state._fsp--;
@@ -36715,12 +36721,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.af((f?f.start:null), (f?f.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8004);
-            p_ArgumentList346=this.p_ArgumentList();
+            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8008);
+            p_ArgumentList345=this.p_ArgumentList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList346.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList345.getTree());
 
 
 
@@ -36757,7 +36763,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1085:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
+    // xquery/XQueryParser.g:1087:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
     // $ANTLR start "p_Argument"
     p_Argument: function() {
         var retval = new XQueryParser.p_Argument_return();
@@ -36765,12 +36771,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle347 = null;
-         var p_ArgumentPlaceholder348 = null;
+         var p_ExprSingle346 = null;
+         var p_ArgumentPlaceholder347 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1086:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
+            // xquery/XQueryParser.g:1088:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
             var alt138=2;
             var LA138_0 = this.input.LA(1);
 
@@ -36789,28 +36795,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt138) {
                 case 1 :
-                    // xquery/XQueryParser.g:1086:11: p_ExprSingle[true]
+                    // xquery/XQueryParser.g:1088:11: p_ExprSingle[true]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8030);
-                    p_ExprSingle347=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8034);
+                    p_ExprSingle346=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle347.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle346.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1086:32: p_ArgumentPlaceholder
+                    // xquery/XQueryParser.g:1088:32: p_ArgumentPlaceholder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035);
-                    p_ArgumentPlaceholder348=this.p_ArgumentPlaceholder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039);
+                    p_ArgumentPlaceholder347=this.p_ArgumentPlaceholder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder348.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder347.getTree());
 
 
                     break;
@@ -36849,7 +36855,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1090:1: p_ArgumentPlaceholder : QUESTION ;
+    // xquery/XQueryParser.g:1092:1: p_ArgumentPlaceholder : QUESTION ;
     // $ANTLR start "p_ArgumentPlaceholder"
     p_ArgumentPlaceholder: function() {
         var retval = new XQueryParser.p_ArgumentPlaceholder_return();
@@ -36857,19 +36863,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION349 = null;
+        var QUESTION348 = null;
 
-        var QUESTION349_tree=null;
+        var QUESTION348_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1091:9: ( QUESTION )
-            // xquery/XQueryParser.g:1091:11: QUESTION
+            // xquery/XQueryParser.g:1093:9: ( QUESTION )
+            // xquery/XQueryParser.g:1093:11: QUESTION
             root_0 = this.adaptor.nil();
 
-            QUESTION349=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061); if (this.state.failed) return retval;
+            QUESTION348=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            QUESTION349_tree = this.adaptor.create(QUESTION349);
-            this.adaptor.addChild(root_0, QUESTION349_tree);
+            QUESTION348_tree = this.adaptor.create(QUESTION348);
+            this.adaptor.addChild(root_0, QUESTION348_tree);
             }
 
 
@@ -36907,7 +36913,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1095:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
+    // xquery/XQueryParser.g:1097:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
     // $ANTLR start "p_Constructor"
     p_Constructor: function() {
         var retval = new XQueryParser.p_Constructor_return();
@@ -36915,12 +36921,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor350 = null;
-         var p_ComputedConstructor351 = null;
+         var p_DirectConstructor349 = null;
+         var p_ComputedConstructor350 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1096:9: ( p_DirectConstructor | p_ComputedConstructor )
+            // xquery/XQueryParser.g:1098:9: ( p_DirectConstructor | p_ComputedConstructor )
             var alt139=2;
             var LA139_0 = this.input.LA(1);
 
@@ -36942,28 +36948,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt139) {
                 case 1 :
-                    // xquery/XQueryParser.g:1096:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1098:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8087);
-                    p_DirectConstructor350=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8091);
+                    p_DirectConstructor349=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor350.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor349.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1097:11: p_ComputedConstructor
+                    // xquery/XQueryParser.g:1099:11: p_ComputedConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8099);
-                    p_ComputedConstructor351=this.p_ComputedConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8103);
+                    p_ComputedConstructor350=this.p_ComputedConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor351.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor350.getTree());
 
 
                     break;
@@ -37002,7 +37008,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1101:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
+    // xquery/XQueryParser.g:1103:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
     // $ANTLR start "p_DirectConstructor"
     p_DirectConstructor: function() {
         var retval = new XQueryParser.p_DirectConstructor_return();
@@ -37010,13 +37016,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirElemConstructor352 = null;
-         var p_DirCommentConstructor353 = null;
-         var p_DirPIConstructor354 = null;
+         var p_DirElemConstructor351 = null;
+         var p_DirCommentConstructor352 = null;
+         var p_DirPIConstructor353 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1102:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
+            // xquery/XQueryParser.g:1104:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
             var alt140=3;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -37038,41 +37044,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt140) {
                 case 1 :
-                    // xquery/XQueryParser.g:1102:11: p_DirElemConstructor
+                    // xquery/XQueryParser.g:1104:11: p_DirElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125);
-                    p_DirElemConstructor352=this.p_DirElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129);
+                    p_DirElemConstructor351=this.p_DirElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor352.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor351.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1103:11: p_DirCommentConstructor
+                    // xquery/XQueryParser.g:1105:11: p_DirCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137);
-                    p_DirCommentConstructor353=this.p_DirCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141);
+                    p_DirCommentConstructor352=this.p_DirCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor353.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor352.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1104:11: p_DirPIConstructor
+                    // xquery/XQueryParser.g:1106:11: p_DirPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149);
-                    p_DirPIConstructor354=this.p_DirPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153);
+                    p_DirPIConstructor353=this.p_DirPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor354.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor353.getTree());
 
 
                     break;
@@ -37111,7 +37117,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1108:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
+    // xquery/XQueryParser.g:1110:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
     // $ANTLR start "p_DirElemConstructor"
     p_DirElemConstructor: function() {
         var retval = new XQueryParser.p_DirElemConstructor_return();
@@ -37119,23 +37125,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SMALLER355 = null;
-        var EMPTY_CLOSE_TAG357 = null;
-        var GREATER358 = null;
-        var CLOSE_TAG360 = null;
-        var S361 = null;
-        var GREATER362 = null;
+        var SMALLER354 = null;
+        var EMPTY_CLOSE_TAG356 = null;
+        var GREATER357 = null;
+        var CLOSE_TAG359 = null;
+        var S360 = null;
+        var GREATER361 = null;
          var ts = null;
          var te = null;
-         var p_DirAttributeList356 = null;
-         var pm_DirElemContent359 = null;
+         var p_DirAttributeList355 = null;
+         var pm_DirElemContent358 = null;
 
-        var SMALLER355_tree=null;
-        var EMPTY_CLOSE_TAG357_tree=null;
-        var GREATER358_tree=null;
-        var CLOSE_TAG360_tree=null;
-        var S361_tree=null;
-        var GREATER362_tree=null;
+        var SMALLER354_tree=null;
+        var EMPTY_CLOSE_TAG356_tree=null;
+        var GREATER357_tree=null;
+        var CLOSE_TAG359_tree=null;
+        var S360_tree=null;
+        var GREATER361_tree=null;
         var stream_CLOSE_TAG=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token CLOSE_TAG");
         var stream_GREATER=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token GREATER");
         var stream_S=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token S");
@@ -37145,15 +37151,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_DirElemContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_DirElemContent");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1109:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
-            // xquery/XQueryParser.g:1109:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
-            SMALLER355=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8176); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER355);
+            // xquery/XQueryParser.g:1111:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
+            // xquery/XQueryParser.g:1111:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            SMALLER354=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8180); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER354);
 
             if ( this.state.backtracking===0 ) {
               this.pushXMLLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8192);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8196);
             ts=this.p_QName();
 
             this.state._fsp--;
@@ -37162,13 +37168,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.at((ts?ts.start:null), (ts?ts.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197);
-            p_DirAttributeList356=this.p_DirAttributeList();
+            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201);
+            p_DirAttributeList355=this.p_DirAttributeList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList356.getTree());
-            // xquery/XQueryParser.g:1111:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList355.getTree());
+            // xquery/XQueryParser.g:1113:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
             var alt143=2;
             var LA143_0 = this.input.LA(1);
 
@@ -37187,21 +37193,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt143) {
                 case 1 :
-                    // xquery/XQueryParser.g:1111:12: EMPTY_CLOSE_TAG
-                    EMPTY_CLOSE_TAG357=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG357);
+                    // xquery/XQueryParser.g:1113:12: EMPTY_CLOSE_TAG
+                    EMPTY_CLOSE_TAG356=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG356);
 
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
-                    GREATER358=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8216); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER358);
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
+                    GREATER357=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8220); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER357);
 
-                    // xquery/XQueryParser.g:1111:39: ( pm_DirElemContent )*
+                    // xquery/XQueryParser.g:1113:39: ( pm_DirElemContent )*
                     loop141:
                     do {
                         var alt141=2;
@@ -37214,13 +37220,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt141) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:39: pm_DirElemContent
-                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218);
-                            pm_DirElemContent359=this.pm_DirElemContent();
+                            // xquery/XQueryParser.g:1113:39: pm_DirElemContent
+                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222);
+                            pm_DirElemContent358=this.pm_DirElemContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent359.getTree());
+                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent358.getTree());
 
 
                             break;
@@ -37230,10 +37236,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    CLOSE_TAG360=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG360);
+                    CLOSE_TAG359=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG359);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8225);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8229);
                     te=this.p_QName();
 
                     this.state._fsp--;
@@ -37242,7 +37248,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.at((te?te.start:null), (te?te.stop:null));
                     }
-                    // xquery/XQueryParser.g:1111:111: ( S )?
+                    // xquery/XQueryParser.g:1113:111: ( S )?
                     var alt142=2;
                     var LA142_0 = this.input.LA(1);
 
@@ -37251,9 +37257,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt142) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:111: S
-                            S361=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8229); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_S.add(S361);
+                            // xquery/XQueryParser.g:1113:111: S
+                            S360=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8233); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_S.add(S360);
 
 
 
@@ -37261,8 +37267,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    GREATER362=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8232); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER362);
+                    GREATER361=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8236); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER361);
 
 
 
@@ -37276,7 +37282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_DirAttributeList, pm_DirElemContent
+            // elements: pm_DirElemContent, p_DirAttributeList
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -37286,19 +37292,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1112:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+            // 1114:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
             {
-                // xquery/XQueryParser.g:1112:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+                // xquery/XQueryParser.g:1114:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirElemConstructor, "DirElemConstructor"), root_1);
 
-                // xquery/XQueryParser.g:1112:41: ^( DirAttributeList ( p_DirAttributeList )* )
+                // xquery/XQueryParser.g:1114:41: ^( DirAttributeList ( p_DirAttributeList )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeList, "DirAttributeList"), root_2);
 
-                // xquery/XQueryParser.g:1112:60: ( p_DirAttributeList )*
+                // xquery/XQueryParser.g:1114:60: ( p_DirAttributeList )*
                 while ( stream_p_DirAttributeList.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_p_DirAttributeList.nextTree());
 
@@ -37307,12 +37313,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:1112:81: ^( DirElemContent ( pm_DirElemContent )* )
+                // xquery/XQueryParser.g:1114:81: ^( DirElemContent ( pm_DirElemContent )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirElemContent, "DirElemContent"), root_2);
 
-                // xquery/XQueryParser.g:1112:98: ( pm_DirElemContent )*
+                // xquery/XQueryParser.g:1114:98: ( pm_DirElemContent )*
                 while ( stream_pm_DirElemContent.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pm_DirElemContent.nextTree());
 
@@ -37364,7 +37370,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1117:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
+    // xquery/XQueryParser.g:1119:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
     // $ANTLR start "p_DirAttributeList"
     p_DirAttributeList: function() {
         var retval = new XQueryParser.p_DirAttributeList_return();
@@ -37372,24 +37378,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+        var S362 = null;
         var S363 = null;
-        var S364 = null;
-        var EQUAL365 = null;
-        var S366 = null;
+        var EQUAL364 = null;
+        var S365 = null;
          var t = null;
          var v = null;
 
+        var S362_tree=null;
         var S363_tree=null;
-        var S364_tree=null;
-        var EQUAL365_tree=null;
-        var S366_tree=null;
+        var EQUAL364_tree=null;
+        var S365_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1118:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             loop147:
             do {
                 var alt147=2;
@@ -37402,13 +37408,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt147) {
                 case 1 :
-                    // xquery/XQueryParser.g:1118:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
-                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8309); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1120:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    S362=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8313); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    S363_tree = this.adaptor.create(S363);
-                    this.adaptor.addChild(root_0, S363_tree);
+                    S362_tree = this.adaptor.create(S362);
+                    this.adaptor.addChild(root_0, S362_tree);
                     }
-                    // xquery/XQueryParser.g:1118:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    // xquery/XQueryParser.g:1120:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
                     var alt146=2;
                     var LA146_0 = this.input.LA(1);
 
@@ -37417,8 +37423,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt146) {
                         case 1 :
-                            // xquery/XQueryParser.g:1118:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
-                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8314);
+                            // xquery/XQueryParser.g:1120:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
+                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8318);
                             t=this.p_QName();
 
                             this.state._fsp--;
@@ -37427,7 +37433,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if ( this.state.backtracking===0 ) {
                               this.at((t?t.start:null), (t?t.stop:null));
                             }
-                            // xquery/XQueryParser.g:1118:55: ( S )?
+                            // xquery/XQueryParser.g:1120:55: ( S )?
                             var alt144=2;
                             var LA144_0 = this.input.LA(1);
 
@@ -37436,11 +37442,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt144) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:55: S
-                                    S364=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8318); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:55: S
+                                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8322); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S364_tree = this.adaptor.create(S364);
-                                    this.adaptor.addChild(root_0, S364_tree);
+                                    S363_tree = this.adaptor.create(S363);
+                                    this.adaptor.addChild(root_0, S363_tree);
                                     }
 
 
@@ -37448,12 +37454,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            EQUAL365=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8321); if (this.state.failed) return retval;
+                            EQUAL364=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8325); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            EQUAL365_tree = this.adaptor.create(EQUAL365);
-                            this.adaptor.addChild(root_0, EQUAL365_tree);
+                            EQUAL364_tree = this.adaptor.create(EQUAL364);
+                            this.adaptor.addChild(root_0, EQUAL364_tree);
                             }
-                            // xquery/XQueryParser.g:1118:64: ( S )?
+                            // xquery/XQueryParser.g:1120:64: ( S )?
                             var alt145=2;
                             var LA145_0 = this.input.LA(1);
 
@@ -37462,11 +37468,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt145) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:64: S
-                                    S366=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8323); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:64: S
+                                    S365=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8327); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S366_tree = this.adaptor.create(S366);
-                                    this.adaptor.addChild(root_0, S366_tree);
+                                    S365_tree = this.adaptor.create(S365);
+                                    this.adaptor.addChild(root_0, S365_tree);
                                     }
 
 
@@ -37474,7 +37480,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328);
+                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332);
                             v=this.p_DirAttributeValue();
 
                             this.state._fsp--;
@@ -37531,7 +37537,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1122:1: p_DirAttributeValue : ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
+    // xquery/XQueryParser.g:1124:1: p_DirAttributeValue : ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
     // $ANTLR start "p_DirAttributeValue"
     p_DirAttributeValue: function() {
         var retval = new XQueryParser.p_DirAttributeValue_return();
@@ -37539,25 +37545,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT367 = null;
-        var ESCAPE_QUOT368 = null;
-        var APOS369 = null;
-        var QUOT371 = null;
-        var APOS372 = null;
-        var ESCAPE_APOS373 = null;
-        var QUOT374 = null;
-        var APOS376 = null;
-         var p_QuotAttrValueContent370 = null;
-         var p_AposAttrValueContent375 = null;
+        var s = null;
+        var list_s=null;
+         var p_QuotAttrValueContent366 = null;
+         var p_AposAttrValueContent367 = null;
 
-        var QUOT367_tree=null;
-        var ESCAPE_QUOT368_tree=null;
-        var APOS369_tree=null;
-        var QUOT371_tree=null;
-        var APOS372_tree=null;
-        var ESCAPE_APOS373_tree=null;
-        var QUOT374_tree=null;
-        var APOS376_tree=null;
+        var s_tree=null;
         var stream_ESCAPE_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_QUOT");
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_ESCAPE_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_APOS");
@@ -37565,7 +37558,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_QuotAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QuotAttrValueContent");
         var stream_p_AposAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_AposAttrValueContent");
         try {
-            // xquery/XQueryParser.g:1123:9: ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
+            // xquery/XQueryParser.g:1125:9: ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
             var alt150=2;
             var LA150_0 = this.input.LA(1);
 
@@ -37584,13 +37577,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt150) {
                 case 1 :
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:12: QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT
-                    QUOT367=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8360); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT367);
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:12: s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8366); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
 
-                    // xquery/XQueryParser.g:1123:17: ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                      this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1125:45: (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )*
                     loop148:
                     do {
                         var alt148=4;
@@ -37614,29 +37613,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt148) {
                         case 1 :
-                            // xquery/XQueryParser.g:1123:18: ESCAPE_QUOT
-                            ESCAPE_QUOT368=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(ESCAPE_QUOT368);
+                            // xquery/XQueryParser.g:1125:46: s+= ESCAPE_QUOT
+                            s=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1123:32: APOS
-                            APOS369=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8367); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_APOS.add(APOS369);
+                            // xquery/XQueryParser.g:1125:63: s+= APOS
+                            s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8379); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1123:39: p_QuotAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371);
-                            p_QuotAttrValueContent370=this.p_QuotAttrValueContent();
+                            // xquery/XQueryParser.g:1125:73: p_QuotAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383);
+                            p_QuotAttrValueContent366=this.p_QuotAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent370.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent366.getTree());
 
 
                             break;
@@ -37646,12 +37651,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    QUOT371=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8375); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT371);
-
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8389); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -37665,14 +37679,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1124:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                    // 1126:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1124:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1124:40: ( p_QuotAttrValueContent )*
+                        // xquery/XQueryParser.g:1126:40: ( p_QuotAttrValueContent )*
                         while ( stream_p_QuotAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_QuotAttrValueContent.nextTree());
 
@@ -37688,13 +37702,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:12: APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS
-                    APOS372=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8414); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS372);
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:12: s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8434); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
 
-                    // xquery/XQueryParser.g:1125:17: ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1127:46: (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )*
                     loop149:
                     do {
                         var alt149=4;
@@ -37718,29 +37738,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt149) {
                         case 1 :
-                            // xquery/XQueryParser.g:1125:18: ESCAPE_APOS
-                            ESCAPE_APOS373=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(ESCAPE_APOS373);
+                            // xquery/XQueryParser.g:1127:47: s+= ESCAPE_APOS
+                            s=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1125:32: QUOT
-                            QUOT374=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8421); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT374);
+                            // xquery/XQueryParser.g:1127:64: s+= QUOT
+                            s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8447); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1125:39: p_AposAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425);
-                            p_AposAttrValueContent375=this.p_AposAttrValueContent();
+                            // xquery/XQueryParser.g:1127:74: p_AposAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451);
+                            p_AposAttrValueContent367=this.p_AposAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent375.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent367.getTree());
 
 
                             break;
@@ -37750,12 +37776,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    APOS376=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8429); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS376);
-
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8457); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -37769,14 +37804,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1126:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                    // 1128:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                        // xquery/XQueryParser.g:1128:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1126:40: ( p_AposAttrValueContent )*
+                        // xquery/XQueryParser.g:1128:40: ( p_AposAttrValueContent )*
                         while ( stream_p_AposAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_AposAttrValueContent.nextTree());
 
@@ -37826,7 +37861,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1130:1: p_QuotAttrValueContent : ( p_QuotAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1132:1: p_QuotAttrValueContent : (s= p_QuotAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_QuotAttrValueContent"
     p_QuotAttrValueContent: function() {
         var retval = new XQueryParser.p_QuotAttrValueContent_return();
@@ -37834,12 +37869,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuotAttrContentChar377 = null;
-         var pm_CommonContent378 = null;
+         var s = null;
+         var pm_CommonContent368 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1131:9: ( p_QuotAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1133:9: (s= p_QuotAttrContentChar | pm_CommonContent )
             var alt151=2;
             var LA151_0 = this.input.LA(1);
 
@@ -37858,28 +37893,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt151) {
                 case 1 :
-                    // xquery/XQueryParser.g:1131:11: p_QuotAttrContentChar
+                    // xquery/XQueryParser.g:1133:11: s= p_QuotAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481);
-                    p_QuotAttrContentChar377=this.p_QuotAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515);
+                    s=this.p_QuotAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuotAttrContentChar377.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1131:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1133:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485);
-                    pm_CommonContent378=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521);
+                    pm_CommonContent368=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent378.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent368.getTree());
 
 
                     break;
@@ -37918,7 +37956,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1135:1: p_AposAttrValueContent : ( p_AposAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1137:1: p_AposAttrValueContent : (s= p_AposAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_AposAttrValueContent"
     p_AposAttrValueContent: function() {
         var retval = new XQueryParser.p_AposAttrValueContent_return();
@@ -37926,12 +37964,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AposAttrContentChar379 = null;
-         var pm_CommonContent380 = null;
+         var s = null;
+         var pm_CommonContent369 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1136:9: ( p_AposAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1138:9: (s= p_AposAttrContentChar | pm_CommonContent )
             var alt152=2;
             var LA152_0 = this.input.LA(1);
 
@@ -37950,28 +37988,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt152) {
                 case 1 :
-                    // xquery/XQueryParser.g:1136:11: p_AposAttrContentChar
+                    // xquery/XQueryParser.g:1138:11: s= p_AposAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511);
-                    p_AposAttrContentChar379=this.p_AposAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549);
+                    s=this.p_AposAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AposAttrContentChar379.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1136:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1138:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515);
-                    pm_CommonContent380=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555);
+                    pm_CommonContent369=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent380.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent369.getTree());
 
 
                     break;
@@ -38010,7 +38051,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1140:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
+    // xquery/XQueryParser.g:1142:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
     // $ANTLR start "pm_DirElemContent"
     pm_DirElemContent: function() {
         var retval = new XQueryParser.pm_DirElemContent_return();
@@ -38018,14 +38059,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor381 = null;
-         var p_CDataSection382 = null;
-         var pm_CommonContent383 = null;
-         var p_ElementContentChar384 = null;
+         var p_DirectConstructor370 = null;
+         var p_CDataSection371 = null;
+         var pm_CommonContent372 = null;
+         var p_ElementContentChar373 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1141:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
+            // xquery/XQueryParser.g:1143:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
             var alt153=4;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -38056,54 +38097,54 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt153) {
                 case 1 :
-                    // xquery/XQueryParser.g:1141:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1143:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541);
-                    p_DirectConstructor381=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581);
+                    p_DirectConstructor370=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor381.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor370.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1142:11: p_CDataSection
+                    // xquery/XQueryParser.g:1144:11: p_CDataSection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8553);
-                    p_CDataSection382=this.p_CDataSection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8593);
+                    p_CDataSection371=this.p_CDataSection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection382.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection371.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1143:11: pm_CommonContent
+                    // xquery/XQueryParser.g:1145:11: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8565);
-                    pm_CommonContent383=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8605);
+                    pm_CommonContent372=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent383.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent372.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1144:11: p_ElementContentChar
+                    // xquery/XQueryParser.g:1146:11: p_ElementContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577);
-                    p_ElementContentChar384=this.p_ElementContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617);
+                    p_ElementContentChar373=this.p_ElementContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar384.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar373.getTree());
 
 
                     break;
@@ -38142,7 +38183,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1150:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml );
+    // xquery/XQueryParser.g:1152:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml );
     // $ANTLR start "pm_CommonContent"
     pm_CommonContent: function() {
         var retval = new XQueryParser.pm_CommonContent_return();
@@ -38150,19 +38191,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_PredefinedEntityRef385 = null;
-        var L_CharRef386 = null;
-        var ESCAPE_LBRACKET387 = null;
-        var ESCAPE_RBRACKET388 = null;
-         var pg_EnclosedExprXml389 = null;
+        var s = null;
+        var L_PredefinedEntityRef374 = null;
+        var L_CharRef375 = null;
+         var pg_EnclosedExprXml376 = null;
 
-        var L_PredefinedEntityRef385_tree=null;
-        var L_CharRef386_tree=null;
-        var ESCAPE_LBRACKET387_tree=null;
-        var ESCAPE_RBRACKET388_tree=null;
+        var s_tree=null;
+        var L_PredefinedEntityRef374_tree=null;
+        var L_CharRef375_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1151:9: ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml )
+            // xquery/XQueryParser.g:1153:9: ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml )
             var alt154=5;
             switch ( this.input.LA(1) ) {
             case L_PredefinedEntityRef:
@@ -38190,63 +38229,69 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt154) {
                 case 1 :
-                    // xquery/XQueryParser.g:1151:11: L_PredefinedEntityRef
+                    // xquery/XQueryParser.g:1153:11: L_PredefinedEntityRef
                     root_0 = this.adaptor.nil();
 
-                    L_PredefinedEntityRef385=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605); if (this.state.failed) return retval;
+                    L_PredefinedEntityRef374=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_PredefinedEntityRef385_tree = this.adaptor.create(L_PredefinedEntityRef385);
-                    this.adaptor.addChild(root_0, L_PredefinedEntityRef385_tree);
+                    L_PredefinedEntityRef374_tree = this.adaptor.create(L_PredefinedEntityRef374);
+                    this.adaptor.addChild(root_0, L_PredefinedEntityRef374_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1152:11: L_CharRef
+                    // xquery/XQueryParser.g:1154:11: L_CharRef
                     root_0 = this.adaptor.nil();
 
-                    L_CharRef386=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8617); if (this.state.failed) return retval;
+                    L_CharRef375=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8657); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_CharRef386_tree = this.adaptor.create(L_CharRef386);
-                    this.adaptor.addChild(root_0, L_CharRef386_tree);
+                    L_CharRef375_tree = this.adaptor.create(L_CharRef375);
+                    this.adaptor.addChild(root_0, L_CharRef375_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1153:11: ESCAPE_LBRACKET
+                    // xquery/XQueryParser.g:1155:11: s= ESCAPE_LBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_LBRACKET387=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_LBRACKET387_tree = this.adaptor.create(ESCAPE_LBRACKET387);
-                    this.adaptor.addChild(root_0, ESCAPE_LBRACKET387_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1154:11: ESCAPE_RBRACKET
+                    // xquery/XQueryParser.g:1156:11: s= ESCAPE_RBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_RBRACKET388=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_RBRACKET388_tree = this.adaptor.create(ESCAPE_RBRACKET388);
-                    this.adaptor.addChild(root_0, ESCAPE_RBRACKET388_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1155:11: pg_EnclosedExprXml
+                    // xquery/XQueryParser.g:1157:11: pg_EnclosedExprXml
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653);
-                    pg_EnclosedExprXml389=this.pg_EnclosedExprXml();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701);
+                    pg_EnclosedExprXml376=this.pg_EnclosedExprXml();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml389.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml376.getTree());
 
 
                     break;
@@ -38285,7 +38330,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1163:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1165:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pg_EnclosedExprXml"
     pg_EnclosedExprXml: function() {
         var retval = new XQueryParser.pg_EnclosedExprXml_return();
@@ -38293,36 +38338,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET390 = null;
-        var RBRACKET392 = null;
-         var p_StatementsAndOptionalExpr391 = null;
+        var LBRACKET377 = null;
+        var RBRACKET379 = null;
+         var p_StatementsAndOptionalExpr378 = null;
 
-        var LBRACKET390_tree=null;
-        var RBRACKET392_tree=null;
+        var LBRACKET377_tree=null;
+        var RBRACKET379_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1164:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1164:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1166:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1166:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET390=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685); if (this.state.failed) return retval;
+            LBRACKET377=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET390_tree = this.adaptor.create(LBRACKET390);
-            this.adaptor.addChild(root_0, LBRACKET390_tree);
+            LBRACKET377_tree = this.adaptor.create(LBRACKET377);
+            this.adaptor.addChild(root_0, LBRACKET377_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.pushXQueryLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701);
-            p_StatementsAndOptionalExpr391=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749);
+            p_StatementsAndOptionalExpr378=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr391.getTree());
-            RBRACKET392=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr378.getTree());
+            RBRACKET379=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET392_tree = this.adaptor.create(RBRACKET392);
-            this.adaptor.addChild(root_0, RBRACKET392_tree);
+            RBRACKET379_tree = this.adaptor.create(RBRACKET379);
+            this.adaptor.addChild(root_0, RBRACKET379_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.popLexer();
@@ -38363,7 +38408,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1171:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
+    // xquery/XQueryParser.g:1173:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
     // $ANTLR start "p_DirCommentConstructor"
     p_DirCommentConstructor: function() {
         var retval = new XQueryParser.p_DirCommentConstructor_return();
@@ -38376,11 +38421,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var c_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1172:9: (c= L_DirCommentConstructor )
-            // xquery/XQueryParser.g:1172:11: c= L_DirCommentConstructor
+            // xquery/XQueryParser.g:1174:9: (c= L_DirCommentConstructor )
+            // xquery/XQueryParser.g:1174:11: c= L_DirCommentConstructor
             root_0 = this.adaptor.nil();
 
-            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746); if (this.state.failed) return retval;
+            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             c_tree = this.adaptor.create(c);
             this.adaptor.addChild(root_0, c_tree);
@@ -38424,7 +38469,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1179:1: p_DirPIConstructor : p= L_DirPIConstructor ;
+    // xquery/XQueryParser.g:1181:1: p_DirPIConstructor : p= L_DirPIConstructor ;
     // $ANTLR start "p_DirPIConstructor"
     p_DirPIConstructor: function() {
         var retval = new XQueryParser.p_DirPIConstructor_return();
@@ -38437,11 +38482,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var p_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1180:9: (p= L_DirPIConstructor )
-            // xquery/XQueryParser.g:1180:11: p= L_DirPIConstructor
+            // xquery/XQueryParser.g:1182:9: (p= L_DirPIConstructor )
+            // xquery/XQueryParser.g:1182:11: p= L_DirPIConstructor
             root_0 = this.adaptor.nil();
 
-            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782); if (this.state.failed) return retval;
+            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             p_tree = this.adaptor.create(p);
             this.adaptor.addChild(root_0, p_tree);
@@ -38485,7 +38530,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1187:1: p_CDataSection : L_CDataSection ;
+    // xquery/XQueryParser.g:1189:1: p_CDataSection : L_CDataSection ;
     // $ANTLR start "p_CDataSection"
     p_CDataSection: function() {
         var retval = new XQueryParser.p_CDataSection_return();
@@ -38493,19 +38538,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_CDataSection393 = null;
+        var L_CDataSection380 = null;
 
-        var L_CDataSection393_tree=null;
+        var L_CDataSection380_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1188:9: ( L_CDataSection )
-            // xquery/XQueryParser.g:1188:11: L_CDataSection
+            // xquery/XQueryParser.g:1190:9: ( L_CDataSection )
+            // xquery/XQueryParser.g:1190:11: L_CDataSection
             root_0 = this.adaptor.nil();
 
-            L_CDataSection393=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8817); if (this.state.failed) return retval;
+            L_CDataSection380=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_CDataSection393_tree = this.adaptor.create(L_CDataSection393);
-            this.adaptor.addChild(root_0, L_CDataSection393_tree);
+            L_CDataSection380_tree = this.adaptor.create(L_CDataSection380);
+            this.adaptor.addChild(root_0, L_CDataSection380_tree);
             }
 
 
@@ -38543,7 +38588,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1195:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
+    // xquery/XQueryParser.g:1197:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
     // $ANTLR start "p_ComputedConstructor"
     p_ComputedConstructor: function() {
         var retval = new XQueryParser.p_ComputedConstructor_return();
@@ -38551,18 +38596,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pm_CompDocConstructor394 = null;
-         var pm_CompElemConstructor395 = null;
-         var pm_CompAttrConstructor396 = null;
-         var p_CompNamespaceConstructor397 = null;
-         var p_CompTextConstructor398 = null;
-         var pm_CompCommentConstructor399 = null;
-         var pm_CompPIConstructor400 = null;
-         var p_CompBinaryConstructor401 = null;
+         var pm_CompDocConstructor381 = null;
+         var pm_CompElemConstructor382 = null;
+         var pm_CompAttrConstructor383 = null;
+         var p_CompNamespaceConstructor384 = null;
+         var p_CompTextConstructor385 = null;
+         var pm_CompCommentConstructor386 = null;
+         var pm_CompPIConstructor387 = null;
+         var p_CompBinaryConstructor388 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1196:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
+            // xquery/XQueryParser.g:1198:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
             var alt155=8;
             var LA155_0 = this.input.LA(1);
 
@@ -38599,110 +38644,110 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt155) {
                 case 1 :
-                    // xquery/XQueryParser.g:1196:11: pm_CompDocConstructor
+                    // xquery/XQueryParser.g:1198:11: pm_CompDocConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849);
-                    pm_CompDocConstructor394=this.pm_CompDocConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897);
+                    pm_CompDocConstructor381=this.pm_CompDocConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor394.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor381.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1197:11: pm_CompElemConstructor
+                    // xquery/XQueryParser.g:1199:11: pm_CompElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861);
-                    pm_CompElemConstructor395=this.pm_CompElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909);
+                    pm_CompElemConstructor382=this.pm_CompElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor395.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor382.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1198:11: pm_CompAttrConstructor
+                    // xquery/XQueryParser.g:1200:11: pm_CompAttrConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873);
-                    pm_CompAttrConstructor396=this.pm_CompAttrConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921);
+                    pm_CompAttrConstructor383=this.pm_CompAttrConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor396.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor383.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1199:11: p_CompNamespaceConstructor
+                    // xquery/XQueryParser.g:1201:11: p_CompNamespaceConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885);
-                    p_CompNamespaceConstructor397=this.p_CompNamespaceConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933);
+                    p_CompNamespaceConstructor384=this.p_CompNamespaceConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor397.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor384.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1200:11: p_CompTextConstructor
+                    // xquery/XQueryParser.g:1202:11: p_CompTextConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897);
-                    p_CompTextConstructor398=this.p_CompTextConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945);
+                    p_CompTextConstructor385=this.p_CompTextConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor398.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor385.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1201:11: pm_CompCommentConstructor
+                    // xquery/XQueryParser.g:1203:11: pm_CompCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909);
-                    pm_CompCommentConstructor399=this.pm_CompCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957);
+                    pm_CompCommentConstructor386=this.pm_CompCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor399.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor386.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1202:11: pm_CompPIConstructor
+                    // xquery/XQueryParser.g:1204:11: pm_CompPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921);
-                    pm_CompPIConstructor400=this.pm_CompPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969);
+                    pm_CompPIConstructor387=this.pm_CompPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor400.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor387.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1203:11: {...}? => p_CompBinaryConstructor
+                    // xquery/XQueryParser.g:1205:11: {...}? => p_CompBinaryConstructor
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ComputedConstructor", "this.lc(MLS)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936);
-                    p_CompBinaryConstructor401=this.p_CompBinaryConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984);
+                    p_CompBinaryConstructor388=this.p_CompBinaryConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor401.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor388.getTree());
 
 
                     break;
@@ -38741,7 +38786,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1208:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1210:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompDocConstructor"
     pm_CompDocConstructor: function() {
         var retval = new XQueryParser.pm_CompDocConstructor_return();
@@ -38750,20 +38795,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET402 = null;
-        var RBRACKET404 = null;
-         var p_StatementsAndOptionalExpr403 = null;
+        var LBRACKET389 = null;
+        var RBRACKET391 = null;
+         var p_StatementsAndOptionalExpr390 = null;
 
         var k_tree=null;
-        var LBRACKET402_tree=null;
-        var RBRACKET404_tree=null;
+        var LBRACKET389_tree=null;
+        var RBRACKET391_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1209:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1209:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1211:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1211:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965); if (this.state.failed) return retval;
+            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -38771,21 +38816,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET402=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor8969); if (this.state.failed) return retval;
+            LBRACKET389=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor9017); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET402_tree = this.adaptor.create(LBRACKET402);
-            this.adaptor.addChild(root_0, LBRACKET402_tree);
+            LBRACKET389_tree = this.adaptor.create(LBRACKET389);
+            this.adaptor.addChild(root_0, LBRACKET389_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971);
-            p_StatementsAndOptionalExpr403=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019);
+            p_StatementsAndOptionalExpr390=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr403.getTree());
-            RBRACKET404=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor8973); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr390.getTree());
+            RBRACKET391=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor9021); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET404_tree = this.adaptor.create(RBRACKET404);
-            this.adaptor.addChild(root_0, RBRACKET404_tree);
+            RBRACKET391_tree = this.adaptor.create(RBRACKET391);
+            this.adaptor.addChild(root_0, RBRACKET391_tree);
             }
 
 
@@ -38823,7 +38868,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1213:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
+    // xquery/XQueryParser.g:1215:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
     // $ANTLR start "pm_CompElemConstructor"
     pm_CompElemConstructor: function() {
         var retval = new XQueryParser.pm_CompElemConstructor_return();
@@ -38832,26 +38877,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET406 = null;
-        var RBRACKET408 = null;
-        var LBRACKET409 = null;
-        var RBRACKET411 = null;
-         var p_QName405 = null;
-         var p_Expr407 = null;
-         var pm_ContentExpr410 = null;
+        var LBRACKET393 = null;
+        var RBRACKET395 = null;
+        var LBRACKET396 = null;
+        var RBRACKET398 = null;
+         var p_QName392 = null;
+         var p_Expr394 = null;
+         var pm_ContentExpr397 = null;
 
         var k_tree=null;
-        var LBRACKET406_tree=null;
-        var RBRACKET408_tree=null;
-        var LBRACKET409_tree=null;
-        var RBRACKET411_tree=null;
+        var LBRACKET393_tree=null;
+        var RBRACKET395_tree=null;
+        var LBRACKET396_tree=null;
+        var RBRACKET398_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1214:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
-            // xquery/XQueryParser.g:1214:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
+            // xquery/XQueryParser.g:1216:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
+            // xquery/XQueryParser.g:1216:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9009); if (this.state.failed) return retval;
+            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9057); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -38859,7 +38904,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1214:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1216:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt156=2;
             var LA156_0 = this.input.LA(1);
 
@@ -38878,35 +38923,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt156) {
                 case 1 :
-                    // xquery/XQueryParser.g:1214:37: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9014);
-                    p_QName405=this.p_QName();
+                    // xquery/XQueryParser.g:1216:37: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9062);
+                    p_QName392=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName405.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName392.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:48: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET406=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9019); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:48: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET393=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9067); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET406_tree = this.adaptor.create(LBRACKET406);
-                    this.adaptor.addChild(root_0, LBRACKET406_tree);
+                    LBRACKET393_tree = this.adaptor.create(LBRACKET393);
+                    this.adaptor.addChild(root_0, LBRACKET393_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9021);
-                    p_Expr407=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9069);
+                    p_Expr394=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr407.getTree());
-                    RBRACKET408=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9024); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr394.getTree());
+                    RBRACKET395=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET408_tree = this.adaptor.create(RBRACKET408);
-                    this.adaptor.addChild(root_0, RBRACKET408_tree);
+                    RBRACKET395_tree = this.adaptor.create(RBRACKET395);
+                    this.adaptor.addChild(root_0, RBRACKET395_tree);
                     }
 
 
@@ -38917,21 +38962,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET409=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9028); if (this.state.failed) return retval;
+            LBRACKET396=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9076); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET409_tree = this.adaptor.create(LBRACKET409);
-            this.adaptor.addChild(root_0, LBRACKET409_tree);
+            LBRACKET396_tree = this.adaptor.create(LBRACKET396);
+            this.adaptor.addChild(root_0, LBRACKET396_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030);
-            pm_ContentExpr410=this.pm_ContentExpr();
+            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078);
+            pm_ContentExpr397=this.pm_ContentExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr410.getTree());
-            RBRACKET411=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9032); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr397.getTree());
+            RBRACKET398=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9080); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET411_tree = this.adaptor.create(RBRACKET411);
-            this.adaptor.addChild(root_0, RBRACKET411_tree);
+            RBRACKET398_tree = this.adaptor.create(RBRACKET398);
+            this.adaptor.addChild(root_0, RBRACKET398_tree);
             }
 
 
@@ -38969,7 +39014,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1219:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1221:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
     // $ANTLR start "pm_ContentExpr"
     pm_ContentExpr: function() {
         var retval = new XQueryParser.pm_ContentExpr_return();
@@ -38977,20 +39022,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr412 = null;
+         var p_StatementsAndOptionalExpr399 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1220:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1220:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1222:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1222:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059);
-            p_StatementsAndOptionalExpr412=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107);
+            p_StatementsAndOptionalExpr399=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr412.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr399.getTree());
 
 
 
@@ -39027,7 +39072,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1225:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1227:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompAttrConstructor"
     pm_CompAttrConstructor: function() {
         var retval = new XQueryParser.pm_CompAttrConstructor_return();
@@ -39036,26 +39081,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET414 = null;
-        var RBRACKET416 = null;
-        var LBRACKET417 = null;
-        var RBRACKET419 = null;
-         var p_QName413 = null;
-         var p_Expr415 = null;
-         var p_StatementsAndOptionalExpr418 = null;
+        var LBRACKET401 = null;
+        var RBRACKET403 = null;
+        var LBRACKET404 = null;
+        var RBRACKET406 = null;
+         var p_QName400 = null;
+         var p_Expr402 = null;
+         var p_StatementsAndOptionalExpr405 = null;
 
         var k_tree=null;
-        var LBRACKET414_tree=null;
-        var RBRACKET416_tree=null;
-        var LBRACKET417_tree=null;
-        var RBRACKET419_tree=null;
+        var LBRACKET401_tree=null;
+        var RBRACKET403_tree=null;
+        var LBRACKET404_tree=null;
+        var RBRACKET406_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1226:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1226:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1228:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1228:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088); if (this.state.failed) return retval;
+            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39063,7 +39108,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1226:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1228:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt157=2;
             var LA157_0 = this.input.LA(1);
 
@@ -39082,35 +39127,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt157) {
                 case 1 :
-                    // xquery/XQueryParser.g:1226:39: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9093);
-                    p_QName413=this.p_QName();
+                    // xquery/XQueryParser.g:1228:39: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9141);
+                    p_QName400=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName413.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName400.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:50: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET414=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:50: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET401=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET414_tree = this.adaptor.create(LBRACKET414);
-                    this.adaptor.addChild(root_0, LBRACKET414_tree);
+                    LBRACKET401_tree = this.adaptor.create(LBRACKET401);
+                    this.adaptor.addChild(root_0, LBRACKET401_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9100);
-                    p_Expr415=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9148);
+                    p_Expr402=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
-                    RBRACKET416=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr402.getTree());
+                    RBRACKET403=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET416_tree = this.adaptor.create(RBRACKET416);
-                    this.adaptor.addChild(root_0, RBRACKET416_tree);
+                    RBRACKET403_tree = this.adaptor.create(RBRACKET403);
+                    this.adaptor.addChild(root_0, RBRACKET403_tree);
                     }
 
 
@@ -39121,21 +39166,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107); if (this.state.failed) return retval;
+            LBRACKET404=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
-            this.adaptor.addChild(root_0, LBRACKET417_tree);
+            LBRACKET404_tree = this.adaptor.create(LBRACKET404);
+            this.adaptor.addChild(root_0, LBRACKET404_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109);
-            p_StatementsAndOptionalExpr418=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157);
+            p_StatementsAndOptionalExpr405=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr418.getTree());
-            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr405.getTree());
+            RBRACKET406=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
-            this.adaptor.addChild(root_0, RBRACKET419_tree);
+            RBRACKET406_tree = this.adaptor.create(RBRACKET406);
+            this.adaptor.addChild(root_0, RBRACKET406_tree);
             }
 
 
@@ -39173,7 +39218,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1230:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
+    // xquery/XQueryParser.g:1232:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
     // $ANTLR start "p_CompNamespaceConstructor"
     p_CompNamespaceConstructor: function() {
         var retval = new XQueryParser.p_CompNamespaceConstructor_return();
@@ -39182,26 +39227,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET421 = null;
-        var RBRACKET423 = null;
-        var LBRACKET424 = null;
-        var RBRACKET426 = null;
-         var p_Prefix420 = null;
-         var p_PrefixExpr422 = null;
-         var p_URIExpr425 = null;
+        var LBRACKET408 = null;
+        var RBRACKET410 = null;
+        var LBRACKET411 = null;
+        var RBRACKET413 = null;
+         var p_Prefix407 = null;
+         var p_PrefixExpr409 = null;
+         var p_URIExpr412 = null;
 
         var k_tree=null;
-        var LBRACKET421_tree=null;
-        var RBRACKET423_tree=null;
-        var LBRACKET424_tree=null;
-        var RBRACKET426_tree=null;
+        var LBRACKET408_tree=null;
+        var RBRACKET410_tree=null;
+        var LBRACKET411_tree=null;
+        var RBRACKET413_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1231:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
-            // xquery/XQueryParser.g:1231:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
+            // xquery/XQueryParser.g:1233:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
+            // xquery/XQueryParser.g:1233:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139); if (this.state.failed) return retval;
+            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39209,7 +39254,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1231:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
+            // xquery/XQueryParser.g:1233:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
             var alt158=2;
             var LA158_0 = this.input.LA(1);
 
@@ -39228,35 +39273,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt158) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:39: p_Prefix
-                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144);
-                    p_Prefix420=this.p_Prefix();
+                    // xquery/XQueryParser.g:1233:39: p_Prefix
+                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192);
+                    p_Prefix407=this.p_Prefix();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix420.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix407.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:51: LBRACKET p_PrefixExpr RBRACKET
-                    LBRACKET421=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:51: LBRACKET p_PrefixExpr RBRACKET
+                    LBRACKET408=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET421_tree = this.adaptor.create(LBRACKET421);
-                    this.adaptor.addChild(root_0, LBRACKET421_tree);
+                    LBRACKET408_tree = this.adaptor.create(LBRACKET408);
+                    this.adaptor.addChild(root_0, LBRACKET408_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151);
-                    p_PrefixExpr422=this.p_PrefixExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199);
+                    p_PrefixExpr409=this.p_PrefixExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr422.getTree());
-                    RBRACKET423=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr409.getTree());
+                    RBRACKET410=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET423_tree = this.adaptor.create(RBRACKET423);
-                    this.adaptor.addChild(root_0, RBRACKET423_tree);
+                    RBRACKET410_tree = this.adaptor.create(RBRACKET410);
+                    this.adaptor.addChild(root_0, RBRACKET410_tree);
                     }
 
 
@@ -39267,12 +39312,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET424=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157); if (this.state.failed) return retval;
+            LBRACKET411=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET424_tree = this.adaptor.create(LBRACKET424);
-            this.adaptor.addChild(root_0, LBRACKET424_tree);
+            LBRACKET411_tree = this.adaptor.create(LBRACKET411);
+            this.adaptor.addChild(root_0, LBRACKET411_tree);
             }
-            // xquery/XQueryParser.g:1231:93: ( p_URIExpr )?
+            // xquery/XQueryParser.g:1233:93: ( p_URIExpr )?
             var alt159=2;
             var LA159_0 = this.input.LA(1);
 
@@ -39281,23 +39326,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt159) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:93: p_URIExpr
-                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159);
-                    p_URIExpr425=this.p_URIExpr();
+                    // xquery/XQueryParser.g:1233:93: p_URIExpr
+                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207);
+                    p_URIExpr412=this.p_URIExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr425.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr412.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET426=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162); if (this.state.failed) return retval;
+            RBRACKET413=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET426_tree = this.adaptor.create(RBRACKET426);
-            this.adaptor.addChild(root_0, RBRACKET426_tree);
+            RBRACKET413_tree = this.adaptor.create(RBRACKET413);
+            this.adaptor.addChild(root_0, RBRACKET413_tree);
             }
 
 
@@ -39335,7 +39380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1235:1: p_Prefix : p_NCName ;
+    // xquery/XQueryParser.g:1237:1: p_Prefix : p_NCName ;
     // $ANTLR start "p_Prefix"
     p_Prefix: function() {
         var retval = new XQueryParser.p_Prefix_return();
@@ -39343,20 +39388,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NCName427 = null;
+         var p_NCName414 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1236:9: ( p_NCName )
-            // xquery/XQueryParser.g:1236:11: p_NCName
+            // xquery/XQueryParser.g:1238:9: ( p_NCName )
+            // xquery/XQueryParser.g:1238:11: p_NCName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9188);
-            p_NCName427=this.p_NCName();
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9236);
+            p_NCName414=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName427.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName414.getTree());
 
 
 
@@ -39393,7 +39438,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1240:1: p_PrefixExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1242:1: p_PrefixExpr : p_Expr[true,true] ;
     // $ANTLR start "p_PrefixExpr"
     p_PrefixExpr: function() {
         var retval = new XQueryParser.p_PrefixExpr_return();
@@ -39401,20 +39446,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr428 = null;
+         var p_Expr415 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1241:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1241:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1243:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1243:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9214);
-            p_Expr428=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9262);
+            p_Expr415=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
 
 
 
@@ -39451,7 +39496,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1245:1: p_URIExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1247:1: p_URIExpr : p_Expr[true,true] ;
     // $ANTLR start "p_URIExpr"
     p_URIExpr: function() {
         var retval = new XQueryParser.p_URIExpr_return();
@@ -39459,20 +39504,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr429 = null;
+         var p_Expr416 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1246:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1246:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1248:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1248:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9241);
-            p_Expr429=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9289);
+            p_Expr416=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr429.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr416.getTree());
 
 
 
@@ -39509,7 +39554,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1250:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1252:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompTextConstructor"
     p_CompTextConstructor: function() {
         var retval = new XQueryParser.p_CompTextConstructor_return();
@@ -39518,20 +39563,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET430 = null;
-        var RBRACKET432 = null;
-         var p_Expr431 = null;
+        var LBRACKET417 = null;
+        var RBRACKET419 = null;
+         var p_Expr418 = null;
 
         var k_tree=null;
-        var LBRACKET430_tree=null;
-        var RBRACKET432_tree=null;
+        var LBRACKET417_tree=null;
+        var RBRACKET419_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1251:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1251:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1253:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1253:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9270); if (this.state.failed) return retval;
+            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9318); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39539,21 +39584,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9274); if (this.state.failed) return retval;
+            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9322); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
-            this.adaptor.addChild(root_0, LBRACKET430_tree);
+            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
+            this.adaptor.addChild(root_0, LBRACKET417_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9276);
-            p_Expr431=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9324);
+            p_Expr418=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr431.getTree());
-            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9279); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr418.getTree());
+            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
-            this.adaptor.addChild(root_0, RBRACKET432_tree);
+            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
+            this.adaptor.addChild(root_0, RBRACKET419_tree);
             }
 
 
@@ -39591,7 +39636,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1255:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1257:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompBinaryConstructor"
     p_CompBinaryConstructor: function() {
         var retval = new XQueryParser.p_CompBinaryConstructor_return();
@@ -39600,20 +39645,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET433 = null;
-        var RBRACKET435 = null;
-         var p_Expr434 = null;
+        var LBRACKET420 = null;
+        var RBRACKET422 = null;
+         var p_Expr421 = null;
 
         var k_tree=null;
-        var LBRACKET433_tree=null;
-        var RBRACKET435_tree=null;
+        var LBRACKET420_tree=null;
+        var RBRACKET422_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1256:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1256:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1258:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1258:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9307); if (this.state.failed) return retval;
+            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9355); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39621,21 +39666,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET433=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311); if (this.state.failed) return retval;
+            LBRACKET420=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET433_tree = this.adaptor.create(LBRACKET433);
-            this.adaptor.addChild(root_0, LBRACKET433_tree);
+            LBRACKET420_tree = this.adaptor.create(LBRACKET420);
+            this.adaptor.addChild(root_0, LBRACKET420_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9313);
-            p_Expr434=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9361);
+            p_Expr421=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr434.getTree());
-            RBRACKET435=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr421.getTree());
+            RBRACKET422=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET435_tree = this.adaptor.create(RBRACKET435);
-            this.adaptor.addChild(root_0, RBRACKET435_tree);
+            RBRACKET422_tree = this.adaptor.create(RBRACKET422);
+            this.adaptor.addChild(root_0, RBRACKET422_tree);
             }
 
 
@@ -39673,7 +39718,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1261:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1263:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompCommentConstructor"
     pm_CompCommentConstructor: function() {
         var retval = new XQueryParser.pm_CompCommentConstructor_return();
@@ -39682,20 +39727,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET436 = null;
-        var RBRACKET438 = null;
-         var p_StatementsAndOptionalExpr437 = null;
+        var LBRACKET423 = null;
+        var RBRACKET425 = null;
+         var p_StatementsAndOptionalExpr424 = null;
 
         var k_tree=null;
-        var LBRACKET436_tree=null;
-        var RBRACKET438_tree=null;
+        var LBRACKET423_tree=null;
+        var RBRACKET425_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1262:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1262:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1264:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1264:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9345); if (this.state.failed) return retval;
+            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39703,21 +39748,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET436=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349); if (this.state.failed) return retval;
+            LBRACKET423=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET436_tree = this.adaptor.create(LBRACKET436);
-            this.adaptor.addChild(root_0, LBRACKET436_tree);
+            LBRACKET423_tree = this.adaptor.create(LBRACKET423);
+            this.adaptor.addChild(root_0, LBRACKET423_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351);
-            p_StatementsAndOptionalExpr437=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399);
+            p_StatementsAndOptionalExpr424=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr437.getTree());
-            RBRACKET438=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr424.getTree());
+            RBRACKET425=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET438_tree = this.adaptor.create(RBRACKET438);
-            this.adaptor.addChild(root_0, RBRACKET438_tree);
+            RBRACKET425_tree = this.adaptor.create(RBRACKET425);
+            this.adaptor.addChild(root_0, RBRACKET425_tree);
             }
 
 
@@ -39755,7 +39800,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1267:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1269:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompPIConstructor"
     pm_CompPIConstructor: function() {
         var retval = new XQueryParser.pm_CompPIConstructor_return();
@@ -39764,26 +39809,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET440 = null;
-        var RBRACKET442 = null;
-        var LBRACKET443 = null;
-        var RBRACKET445 = null;
-         var p_NCName439 = null;
-         var p_Expr441 = null;
-         var p_StatementsAndOptionalExpr444 = null;
+        var LBRACKET427 = null;
+        var RBRACKET429 = null;
+        var LBRACKET430 = null;
+        var RBRACKET432 = null;
+         var p_NCName426 = null;
+         var p_Expr428 = null;
+         var p_StatementsAndOptionalExpr431 = null;
 
         var k_tree=null;
-        var LBRACKET440_tree=null;
-        var RBRACKET442_tree=null;
-        var LBRACKET443_tree=null;
-        var RBRACKET445_tree=null;
+        var LBRACKET427_tree=null;
+        var RBRACKET429_tree=null;
+        var LBRACKET430_tree=null;
+        var RBRACKET432_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1268:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1268:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1270:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1270:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382); if (this.state.failed) return retval;
+            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39791,7 +39836,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1268:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1270:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt160=2;
             var LA160_0 = this.input.LA(1);
 
@@ -39810,35 +39855,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt160) {
                 case 1 :
-                    // xquery/XQueryParser.g:1268:52: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9387);
-                    p_NCName439=this.p_NCName();
+                    // xquery/XQueryParser.g:1270:52: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9435);
+                    p_NCName426=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName439.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName426.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:64: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET440=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9392); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:64: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET427=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9440); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET440_tree = this.adaptor.create(LBRACKET440);
-                    this.adaptor.addChild(root_0, LBRACKET440_tree);
+                    LBRACKET427_tree = this.adaptor.create(LBRACKET427);
+                    this.adaptor.addChild(root_0, LBRACKET427_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9394);
-                    p_Expr441=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9442);
+                    p_Expr428=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr441.getTree());
-                    RBRACKET442=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9397); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+                    RBRACKET429=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9445); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET442_tree = this.adaptor.create(RBRACKET442);
-                    this.adaptor.addChild(root_0, RBRACKET442_tree);
+                    RBRACKET429_tree = this.adaptor.create(RBRACKET429);
+                    this.adaptor.addChild(root_0, RBRACKET429_tree);
                     }
 
 
@@ -39849,21 +39894,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET443=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9401); if (this.state.failed) return retval;
+            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9449); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET443_tree = this.adaptor.create(LBRACKET443);
-            this.adaptor.addChild(root_0, LBRACKET443_tree);
+            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
+            this.adaptor.addChild(root_0, LBRACKET430_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403);
-            p_StatementsAndOptionalExpr444=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451);
+            p_StatementsAndOptionalExpr431=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr444.getTree());
-            RBRACKET445=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9405); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr431.getTree());
+            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9453); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET445_tree = this.adaptor.create(RBRACKET445);
-            this.adaptor.addChild(root_0, RBRACKET445_tree);
+            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
+            this.adaptor.addChild(root_0, RBRACKET432_tree);
             }
 
 
@@ -39901,7 +39946,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1290:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
+    // xquery/XQueryParser.g:1292:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
     // $ANTLR start "p_SingleType"
     p_SingleType: function() {
         var retval = new XQueryParser.p_SingleType_return();
@@ -39909,23 +39954,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION447 = null;
-         var p_AtomicOrUnionType446 = null;
+        var QUESTION434 = null;
+         var p_AtomicOrUnionType433 = null;
 
-        var QUESTION447_tree=null;
+        var QUESTION434_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1291:9: ( p_AtomicOrUnionType ( QUESTION )? )
-            // xquery/XQueryParser.g:1291:11: p_AtomicOrUnionType ( QUESTION )?
+            // xquery/XQueryParser.g:1293:9: ( p_AtomicOrUnionType ( QUESTION )? )
+            // xquery/XQueryParser.g:1293:11: p_AtomicOrUnionType ( QUESTION )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449);
-            p_AtomicOrUnionType446=this.p_AtomicOrUnionType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497);
+            p_AtomicOrUnionType433=this.p_AtomicOrUnionType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType446.getTree());
-            // xquery/XQueryParser.g:1291:31: ( QUESTION )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType433.getTree());
+            // xquery/XQueryParser.g:1293:31: ( QUESTION )?
             var alt161=2;
             var LA161_0 = this.input.LA(1);
 
@@ -39934,11 +39979,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt161) {
                 case 1 :
-                    // xquery/XQueryParser.g:1291:31: QUESTION
-                    QUESTION447=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9451); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1293:31: QUESTION
+                    QUESTION434=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9499); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    QUESTION447_tree = this.adaptor.create(QUESTION447);
-                    this.adaptor.addChild(root_0, QUESTION447_tree);
+                    QUESTION434_tree = this.adaptor.create(QUESTION434);
+                    this.adaptor.addChild(root_0, QUESTION434_tree);
                     }
 
 
@@ -39982,7 +40027,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1295:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
+    // xquery/XQueryParser.g:1297:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
     // $ANTLR start "p_TypeDeclaration"
     p_TypeDeclaration: function() {
         var retval = new XQueryParser.p_TypeDeclaration_return();
@@ -39997,15 +40042,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_AS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token AS");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:1296:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
-            // xquery/XQueryParser.g:1296:11: k= AS st= p_SequenceType
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9480); if (this.state.failed) return retval; 
+            // xquery/XQueryParser.g:1298:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
+            // xquery/XQueryParser.g:1298:11: k= AS st= p_SequenceType
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9528); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_AS.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9486);
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9534);
             st=this.p_SequenceType();
 
             this.state._fsp--;
@@ -40025,9 +40070,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1297:17: -> ^( TypeDeclaration $st)
+            // 1299:17: -> ^( TypeDeclaration $st)
             {
-                // xquery/XQueryParser.g:1297:20: ^( TypeDeclaration $st)
+                // xquery/XQueryParser.g:1299:20: ^( TypeDeclaration $st)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(TypeDeclaration, "TypeDeclaration"), root_1);
@@ -40075,7 +40120,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1301:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
+    // xquery/XQueryParser.g:1303:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
     // $ANTLR start "p_SequenceType"
     p_SequenceType: function() {
         var retval = new XQueryParser.p_SequenceType_return();
@@ -40098,7 +40143,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_ItemType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ItemType");
         var stream_p_OccurrenceIndicator=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_OccurrenceIndicator");
         try {
-            // xquery/XQueryParser.g:1302:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
+            // xquery/XQueryParser.g:1304:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
             var alt163=2;
             var LA163_0 = this.input.LA(1);
 
@@ -40131,23 +40176,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt163) {
                 case 1 :
-                    // xquery/XQueryParser.g:1302:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
-                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:1304:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
+                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EMPTY_SEQUENCE.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9545); if (this.state.failed) return retval; 
+                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9593); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LPAREN.add(l);
 
-                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9549); if (this.state.failed) return retval; 
+                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9597); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_RPAREN.add(r);
 
 
 
                     // AST REWRITE
-                    // elements: l, k, r
+                    // elements: k, r, l
                     // token labels: r, l, k
                     // rule labels: retval
                     // token list labels: 
@@ -40160,14 +40205,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1303:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                    // 1305:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                     {
-                        // xquery/XQueryParser.g:1303:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                        // xquery/XQueryParser.g:1305:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
-                        // xquery/XQueryParser.g:1303:35: ^( EmptySequenceTest $k $l $r)
+                        // xquery/XQueryParser.g:1305:35: ^( EmptySequenceTest $k $l $r)
                         {
                         var root_2 = this.adaptor.nil();
                         root_2 = this.adaptor.becomeRoot(this.adaptor.create(EmptySequenceTest, "EmptySequenceTest"), root_2);
@@ -40188,20 +40233,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1304:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9598);
+                    // xquery/XQueryParser.g:1306:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9646);
                     it=this.p_ItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_ItemType.add(it.getTree());
-                    // xquery/XQueryParser.g:1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    // xquery/XQueryParser.g:1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
                     var alt162=2;
                     alt162 = this.dfa162.predict(this.input);
                     switch (alt162) {
                         case 1 :
-                            // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
-                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609);
+                            // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
+                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657);
                             oi=this.p_OccurrenceIndicator();
 
                             this.state._fsp--;
@@ -40228,15 +40273,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_oi=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token oi",oi!=null?oi.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1305:17: -> ^( SequenceType $it ( $oi)? )
+                    // 1307:17: -> ^( SequenceType $it ( $oi)? )
                     {
-                        // xquery/XQueryParser.g:1305:20: ^( SequenceType $it ( $oi)? )
+                        // xquery/XQueryParser.g:1307:20: ^( SequenceType $it ( $oi)? )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
                         this.adaptor.addChild(root_1, stream_it.nextTree());
-                        // xquery/XQueryParser.g:1305:39: ( $oi)?
+                        // xquery/XQueryParser.g:1307:39: ( $oi)?
                         if ( stream_oi.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_oi.nextTree());
 
@@ -40286,7 +40331,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1309:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
+    // xquery/XQueryParser.g:1311:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
     // $ANTLR start "p_OccurrenceIndicator"
     p_OccurrenceIndicator: function() {
         var retval = new XQueryParser.p_OccurrenceIndicator_return();
@@ -40294,19 +40339,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set448 = null;
+        var set435 = null;
 
-        var set448_tree=null;
+        var set435_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1310:9: ( QUESTION | STAR | PLUS )
+            // xquery/XQueryParser.g:1312:9: ( QUESTION | STAR | PLUS )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set448=this.input.LT(1);
+            set435=this.input.LT(1);
             if ( (this.input.LA(1)>=QUESTION && this.input.LA(1)<=PLUS) ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set448));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set435));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -40351,7 +40396,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
+    // xquery/XQueryParser.g:1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
     // $ANTLR start "p_ItemType"
     p_ItemType: function() {
         var retval = new XQueryParser.p_ItemType_return();
@@ -40359,40 +40404,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var BINARY450 = null;
-        var LPAREN451 = null;
-        var RPAREN452 = null;
-        var ITEM453 = null;
-        var LPAREN454 = null;
-        var RPAREN455 = null;
-         var p_KindTest449 = null;
-         var p_AtomicOrUnionType456 = null;
-         var p_ParenthesizedItemType457 = null;
+        var BINARY437 = null;
+        var LPAREN438 = null;
+        var RPAREN439 = null;
+        var ITEM440 = null;
+        var LPAREN441 = null;
+        var RPAREN442 = null;
+         var p_KindTest436 = null;
+         var p_AtomicOrUnionType443 = null;
+         var p_ParenthesizedItemType444 = null;
 
-        var BINARY450_tree=null;
-        var LPAREN451_tree=null;
-        var RPAREN452_tree=null;
-        var ITEM453_tree=null;
-        var LPAREN454_tree=null;
-        var RPAREN455_tree=null;
+        var BINARY437_tree=null;
+        var LPAREN438_tree=null;
+        var RPAREN439_tree=null;
+        var ITEM440_tree=null;
+        var LPAREN441_tree=null;
+        var RPAREN442_tree=null;
         var stream_RPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RPAREN");
         var stream_ITEM=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ITEM");
         var stream_BINARY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BINARY");
         var stream_LPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token LPAREN");
         var stream_p_KindTest=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_KindTest");
         try {
-            // xquery/XQueryParser.g:1315:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
+            // xquery/XQueryParser.g:1317:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
             var alt164=5;
             alt164 = this.dfa164.predict(this.input);
             switch (alt164) {
                 case 1 :
-                    // xquery/XQueryParser.g:1315:11: p_KindTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9711);
-                    p_KindTest449=this.p_KindTest();
+                    // xquery/XQueryParser.g:1317:11: p_KindTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9759);
+                    p_KindTest436=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest449.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest436.getTree());
 
 
                     // AST REWRITE
@@ -40406,9 +40451,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1316:17: -> ^( KindTest p_KindTest )
+                    // 1318:17: -> ^( KindTest p_KindTest )
                     {
-                        // xquery/XQueryParser.g:1316:20: ^( KindTest p_KindTest )
+                        // xquery/XQueryParser.g:1318:20: ^( KindTest p_KindTest )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(KindTest, "KindTest"), root_1);
@@ -40424,21 +40469,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1317:11: {...}? => ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:11: {...}? => ( BINARY LPAREN RPAREN )
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ItemType", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:1317:29: ( BINARY LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1317:30: BINARY LPAREN RPAREN
-                    BINARY450=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9751); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY450);
+                    // xquery/XQueryParser.g:1319:29: ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:30: BINARY LPAREN RPAREN
+                    BINARY437=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9799); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY437);
 
-                    LPAREN451=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9753); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN451);
+                    LPAREN438=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN438);
 
-                    RPAREN452=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9755); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN452);
+                    RPAREN439=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9803); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN439);
 
 
 
@@ -40446,7 +40491,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: LPAREN, RPAREN, BINARY
+                    // elements: BINARY, LPAREN, RPAREN
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -40456,9 +40501,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1318:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
+                    // 1320:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1318:20: ^( BinaryTest BINARY LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1320:20: ^( BinaryTest BINARY LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(BinaryTest, "BinaryTest"), root_1);
@@ -40476,17 +40521,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:12: ITEM LPAREN RPAREN
-                    ITEM453=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9797); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM453);
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:12: ITEM LPAREN RPAREN
+                    ITEM440=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9845); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM440);
 
-                    LPAREN454=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9799); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN454);
+                    LPAREN441=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9847); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN441);
 
-                    RPAREN455=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN455);
+                    RPAREN442=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9849); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN442);
 
 
 
@@ -40494,7 +40539,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: ITEM, RPAREN, LPAREN
+                    // elements: RPAREN, LPAREN, ITEM
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -40504,9 +40549,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1320:17: -> ^( ItemTest ITEM LPAREN RPAREN )
+                    // 1322:17: -> ^( ItemTest ITEM LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1320:20: ^( ItemTest ITEM LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1322:20: ^( ItemTest ITEM LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(ItemTest, "ItemTest"), root_1);
@@ -40524,28 +40569,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1324:11: p_AtomicOrUnionType
+                    // xquery/XQueryParser.g:1326:11: p_AtomicOrUnionType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845);
-                    p_AtomicOrUnionType456=this.p_AtomicOrUnionType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893);
+                    p_AtomicOrUnionType443=this.p_AtomicOrUnionType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType456.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType443.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1325:11: p_ParenthesizedItemType
+                    // xquery/XQueryParser.g:1327:11: p_ParenthesizedItemType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857);
-                    p_ParenthesizedItemType457=this.p_ParenthesizedItemType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905);
+                    p_ParenthesizedItemType444=this.p_ParenthesizedItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType457.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType444.getTree());
 
 
                     break;
@@ -40584,7 +40629,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1329:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
+    // xquery/XQueryParser.g:1331:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
     // $ANTLR start "p_AtomicOrUnionType"
     p_AtomicOrUnionType: function() {
         var retval = new XQueryParser.p_AtomicOrUnionType_return();
@@ -40592,18 +40637,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName458 = null;
+         var p_QName445 = null;
 
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1330:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
-            // xquery/XQueryParser.g:1330:11: p_QName
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9883);
-            p_QName458=this.p_QName();
+            // xquery/XQueryParser.g:1332:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
+            // xquery/XQueryParser.g:1332:11: p_QName
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9931);
+            p_QName445=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName458.getTree());
+            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName445.getTree());
 
 
             // AST REWRITE
@@ -40617,9 +40662,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1331:17: -> ^( AtomicOrUnionType p_QName )
+            // 1333:17: -> ^( AtomicOrUnionType p_QName )
             {
-                // xquery/XQueryParser.g:1331:20: ^( AtomicOrUnionType p_QName )
+                // xquery/XQueryParser.g:1333:20: ^( AtomicOrUnionType p_QName )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AtomicOrUnionType, "AtomicOrUnionType"), root_1);
@@ -40667,7 +40712,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1335:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
+    // xquery/XQueryParser.g:1337:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
     // $ANTLR start "p_KindTest"
     p_KindTest: function() {
         var retval = new XQueryParser.p_KindTest_return();
@@ -40675,20 +40720,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DocumentTest459 = null;
-         var p_ElementTest460 = null;
-         var p_AttributeTest461 = null;
-         var p_SchemaElementTest462 = null;
-         var p_SchemaAttributeTest463 = null;
-         var p_PITest464 = null;
-         var p_CommentTest465 = null;
-         var p_TextTest466 = null;
-         var p_NamespaceNodeTest467 = null;
-         var p_AnyKindTest468 = null;
+         var p_DocumentTest446 = null;
+         var p_ElementTest447 = null;
+         var p_AttributeTest448 = null;
+         var p_SchemaElementTest449 = null;
+         var p_SchemaAttributeTest450 = null;
+         var p_PITest451 = null;
+         var p_CommentTest452 = null;
+         var p_TextTest453 = null;
+         var p_NamespaceNodeTest454 = null;
+         var p_AnyKindTest455 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1336:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
+            // xquery/XQueryParser.g:1338:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
             var alt165=10;
             switch ( this.input.LA(1) ) {
             case DOCUMENT_NODE:
@@ -40731,132 +40776,132 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt165) {
                 case 1 :
-                    // xquery/XQueryParser.g:1336:11: p_DocumentTest
+                    // xquery/XQueryParser.g:1338:11: p_DocumentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9933);
-                    p_DocumentTest459=this.p_DocumentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9981);
+                    p_DocumentTest446=this.p_DocumentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest459.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest446.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1337:11: p_ElementTest
+                    // xquery/XQueryParser.g:1339:11: p_ElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9945);
-                    p_ElementTest460=this.p_ElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9993);
+                    p_ElementTest447=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest460.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest447.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1338:11: p_AttributeTest
+                    // xquery/XQueryParser.g:1340:11: p_AttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest9957);
-                    p_AttributeTest461=this.p_AttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest10005);
+                    p_AttributeTest448=this.p_AttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest461.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest448.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1339:11: p_SchemaElementTest
+                    // xquery/XQueryParser.g:1341:11: p_SchemaElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest9969);
-                    p_SchemaElementTest462=this.p_SchemaElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest10017);
+                    p_SchemaElementTest449=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest449.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1340:11: p_SchemaAttributeTest
+                    // xquery/XQueryParser.g:1342:11: p_SchemaAttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981);
-                    p_SchemaAttributeTest463=this.p_SchemaAttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029);
+                    p_SchemaAttributeTest450=this.p_SchemaAttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest463.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest450.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1341:11: p_PITest
+                    // xquery/XQueryParser.g:1343:11: p_PITest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest9993);
-                    p_PITest464=this.p_PITest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest10041);
+                    p_PITest451=this.p_PITest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest464.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest451.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1342:11: p_CommentTest
+                    // xquery/XQueryParser.g:1344:11: p_CommentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10005);
-                    p_CommentTest465=this.p_CommentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10053);
+                    p_CommentTest452=this.p_CommentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest465.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest452.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1343:11: p_TextTest
+                    // xquery/XQueryParser.g:1345:11: p_TextTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10017);
-                    p_TextTest466=this.p_TextTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10065);
+                    p_TextTest453=this.p_TextTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest466.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest453.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1344:11: p_NamespaceNodeTest
+                    // xquery/XQueryParser.g:1346:11: p_NamespaceNodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029);
-                    p_NamespaceNodeTest467=this.p_NamespaceNodeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077);
+                    p_NamespaceNodeTest454=this.p_NamespaceNodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest467.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest454.getTree());
 
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:1345:11: p_AnyKindTest
+                    // xquery/XQueryParser.g:1347:11: p_AnyKindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10041);
-                    p_AnyKindTest468=this.p_AnyKindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10089);
+                    p_AnyKindTest455=this.p_AnyKindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest468.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest455.getTree());
 
 
                     break;
@@ -40895,7 +40940,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1349:1: p_AnyKindTest : NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1351:1: p_AnyKindTest : NODE LPAREN RPAREN ;
     // $ANTLR start "p_AnyKindTest"
     p_AnyKindTest: function() {
         var retval = new XQueryParser.p_AnyKindTest_return();
@@ -40903,33 +40948,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NODE469 = null;
-        var LPAREN470 = null;
-        var RPAREN471 = null;
+        var NODE456 = null;
+        var LPAREN457 = null;
+        var RPAREN458 = null;
 
-        var NODE469_tree=null;
-        var LPAREN470_tree=null;
-        var RPAREN471_tree=null;
+        var NODE456_tree=null;
+        var LPAREN457_tree=null;
+        var RPAREN458_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1350:9: ( NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1350:11: NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1352:9: ( NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1352:11: NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NODE469=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10067); if (this.state.failed) return retval;
+            NODE456=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10115); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NODE469_tree = this.adaptor.create(NODE469);
-            this.adaptor.addChild(root_0, NODE469_tree);
+            NODE456_tree = this.adaptor.create(NODE456);
+            this.adaptor.addChild(root_0, NODE456_tree);
             }
-            LPAREN470=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10069); if (this.state.failed) return retval;
+            LPAREN457=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10117); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN470_tree = this.adaptor.create(LPAREN470);
-            this.adaptor.addChild(root_0, LPAREN470_tree);
+            LPAREN457_tree = this.adaptor.create(LPAREN457);
+            this.adaptor.addChild(root_0, LPAREN457_tree);
             }
-            RPAREN471=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10071); if (this.state.failed) return retval;
+            RPAREN458=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10119); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN471_tree = this.adaptor.create(RPAREN471);
-            this.adaptor.addChild(root_0, RPAREN471_tree);
+            RPAREN458_tree = this.adaptor.create(RPAREN458);
+            this.adaptor.addChild(root_0, RPAREN458_tree);
             }
 
 
@@ -40967,7 +41012,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1354:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
+    // xquery/XQueryParser.g:1356:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
     // $ANTLR start "p_DocumentTest"
     p_DocumentTest: function() {
         var retval = new XQueryParser.p_DocumentTest_return();
@@ -40975,32 +41020,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOCUMENT_NODE472 = null;
-        var LPAREN473 = null;
-        var RPAREN476 = null;
-         var p_ElementTest474 = null;
-         var p_SchemaElementTest475 = null;
+        var DOCUMENT_NODE459 = null;
+        var LPAREN460 = null;
+        var RPAREN463 = null;
+         var p_ElementTest461 = null;
+         var p_SchemaElementTest462 = null;
 
-        var DOCUMENT_NODE472_tree=null;
-        var LPAREN473_tree=null;
-        var RPAREN476_tree=null;
+        var DOCUMENT_NODE459_tree=null;
+        var LPAREN460_tree=null;
+        var RPAREN463_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1355:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
-            // xquery/XQueryParser.g:1355:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
+            // xquery/XQueryParser.g:1357:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
+            // xquery/XQueryParser.g:1357:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
             root_0 = this.adaptor.nil();
 
-            DOCUMENT_NODE472=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097); if (this.state.failed) return retval;
+            DOCUMENT_NODE459=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOCUMENT_NODE472_tree = this.adaptor.create(DOCUMENT_NODE472);
-            this.adaptor.addChild(root_0, DOCUMENT_NODE472_tree);
+            DOCUMENT_NODE459_tree = this.adaptor.create(DOCUMENT_NODE459);
+            this.adaptor.addChild(root_0, DOCUMENT_NODE459_tree);
             }
-            LPAREN473=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10099); if (this.state.failed) return retval;
+            LPAREN460=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10147); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN473_tree = this.adaptor.create(LPAREN473);
-            this.adaptor.addChild(root_0, LPAREN473_tree);
+            LPAREN460_tree = this.adaptor.create(LPAREN460);
+            this.adaptor.addChild(root_0, LPAREN460_tree);
             }
-            // xquery/XQueryParser.g:1355:32: ( p_ElementTest | p_SchemaElementTest )?
+            // xquery/XQueryParser.g:1357:32: ( p_ElementTest | p_SchemaElementTest )?
             var alt166=3;
             var LA166_0 = this.input.LA(1);
 
@@ -41012,34 +41057,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt166) {
                 case 1 :
-                    // xquery/XQueryParser.g:1355:33: p_ElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10102);
-                    p_ElementTest474=this.p_ElementTest();
+                    // xquery/XQueryParser.g:1357:33: p_ElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10150);
+                    p_ElementTest461=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest474.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest461.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1355:49: p_SchemaElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106);
-                    p_SchemaElementTest475=this.p_SchemaElementTest();
+                    // xquery/XQueryParser.g:1357:49: p_SchemaElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154);
+                    p_SchemaElementTest462=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest475.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
 
 
                     break;
 
             }
 
-            RPAREN476=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10110); if (this.state.failed) return retval;
+            RPAREN463=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10158); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN476_tree = this.adaptor.create(RPAREN476);
-            this.adaptor.addChild(root_0, RPAREN476_tree);
+            RPAREN463_tree = this.adaptor.create(RPAREN463);
+            this.adaptor.addChild(root_0, RPAREN463_tree);
             }
 
 
@@ -41077,7 +41122,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1359:1: p_TextTest : TEXT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1361:1: p_TextTest : TEXT LPAREN RPAREN ;
     // $ANTLR start "p_TextTest"
     p_TextTest: function() {
         var retval = new XQueryParser.p_TextTest_return();
@@ -41085,33 +41130,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var TEXT477 = null;
-        var LPAREN478 = null;
-        var RPAREN479 = null;
+        var TEXT464 = null;
+        var LPAREN465 = null;
+        var RPAREN466 = null;
 
-        var TEXT477_tree=null;
-        var LPAREN478_tree=null;
-        var RPAREN479_tree=null;
+        var TEXT464_tree=null;
+        var LPAREN465_tree=null;
+        var RPAREN466_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1360:9: ( TEXT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1360:11: TEXT LPAREN RPAREN
+            // xquery/XQueryParser.g:1362:9: ( TEXT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1362:11: TEXT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            TEXT477=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10136); if (this.state.failed) return retval;
+            TEXT464=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10184); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            TEXT477_tree = this.adaptor.create(TEXT477);
-            this.adaptor.addChild(root_0, TEXT477_tree);
+            TEXT464_tree = this.adaptor.create(TEXT464);
+            this.adaptor.addChild(root_0, TEXT464_tree);
             }
-            LPAREN478=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10138); if (this.state.failed) return retval;
+            LPAREN465=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10186); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN478_tree = this.adaptor.create(LPAREN478);
-            this.adaptor.addChild(root_0, LPAREN478_tree);
+            LPAREN465_tree = this.adaptor.create(LPAREN465);
+            this.adaptor.addChild(root_0, LPAREN465_tree);
             }
-            RPAREN479=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10140); if (this.state.failed) return retval;
+            RPAREN466=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10188); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN479_tree = this.adaptor.create(RPAREN479);
-            this.adaptor.addChild(root_0, RPAREN479_tree);
+            RPAREN466_tree = this.adaptor.create(RPAREN466);
+            this.adaptor.addChild(root_0, RPAREN466_tree);
             }
 
 
@@ -41149,7 +41194,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1364:1: p_CommentTest : COMMENT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1366:1: p_CommentTest : COMMENT LPAREN RPAREN ;
     // $ANTLR start "p_CommentTest"
     p_CommentTest: function() {
         var retval = new XQueryParser.p_CommentTest_return();
@@ -41157,33 +41202,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMENT480 = null;
-        var LPAREN481 = null;
-        var RPAREN482 = null;
+        var COMMENT467 = null;
+        var LPAREN468 = null;
+        var RPAREN469 = null;
 
-        var COMMENT480_tree=null;
-        var LPAREN481_tree=null;
-        var RPAREN482_tree=null;
+        var COMMENT467_tree=null;
+        var LPAREN468_tree=null;
+        var RPAREN469_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1365:9: ( COMMENT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1365:11: COMMENT LPAREN RPAREN
+            // xquery/XQueryParser.g:1367:9: ( COMMENT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1367:11: COMMENT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            COMMENT480=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10166); if (this.state.failed) return retval;
+            COMMENT467=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10214); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            COMMENT480_tree = this.adaptor.create(COMMENT480);
-            this.adaptor.addChild(root_0, COMMENT480_tree);
+            COMMENT467_tree = this.adaptor.create(COMMENT467);
+            this.adaptor.addChild(root_0, COMMENT467_tree);
             }
-            LPAREN481=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10168); if (this.state.failed) return retval;
+            LPAREN468=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN481_tree = this.adaptor.create(LPAREN481);
-            this.adaptor.addChild(root_0, LPAREN481_tree);
+            LPAREN468_tree = this.adaptor.create(LPAREN468);
+            this.adaptor.addChild(root_0, LPAREN468_tree);
             }
-            RPAREN482=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10170); if (this.state.failed) return retval;
+            RPAREN469=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10218); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN482_tree = this.adaptor.create(RPAREN482);
-            this.adaptor.addChild(root_0, RPAREN482_tree);
+            RPAREN469_tree = this.adaptor.create(RPAREN469);
+            this.adaptor.addChild(root_0, RPAREN469_tree);
             }
 
 
@@ -41221,7 +41266,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1369:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1371:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
     // $ANTLR start "p_NamespaceNodeTest"
     p_NamespaceNodeTest: function() {
         var retval = new XQueryParser.p_NamespaceNodeTest_return();
@@ -41229,33 +41274,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NAMESPACE_NODE483 = null;
-        var LPAREN484 = null;
-        var RPAREN485 = null;
+        var NAMESPACE_NODE470 = null;
+        var LPAREN471 = null;
+        var RPAREN472 = null;
 
-        var NAMESPACE_NODE483_tree=null;
-        var LPAREN484_tree=null;
-        var RPAREN485_tree=null;
+        var NAMESPACE_NODE470_tree=null;
+        var LPAREN471_tree=null;
+        var RPAREN472_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1370:9: ( NAMESPACE_NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1370:11: NAMESPACE_NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1372:9: ( NAMESPACE_NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1372:11: NAMESPACE_NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NAMESPACE_NODE483=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196); if (this.state.failed) return retval;
+            NAMESPACE_NODE470=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NAMESPACE_NODE483_tree = this.adaptor.create(NAMESPACE_NODE483);
-            this.adaptor.addChild(root_0, NAMESPACE_NODE483_tree);
+            NAMESPACE_NODE470_tree = this.adaptor.create(NAMESPACE_NODE470);
+            this.adaptor.addChild(root_0, NAMESPACE_NODE470_tree);
             }
-            LPAREN484=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10198); if (this.state.failed) return retval;
+            LPAREN471=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10246); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN484_tree = this.adaptor.create(LPAREN484);
-            this.adaptor.addChild(root_0, LPAREN484_tree);
+            LPAREN471_tree = this.adaptor.create(LPAREN471);
+            this.adaptor.addChild(root_0, LPAREN471_tree);
             }
-            RPAREN485=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10200); if (this.state.failed) return retval;
+            RPAREN472=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10248); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN485_tree = this.adaptor.create(RPAREN485);
-            this.adaptor.addChild(root_0, RPAREN485_tree);
+            RPAREN472_tree = this.adaptor.create(RPAREN472);
+            this.adaptor.addChild(root_0, RPAREN472_tree);
             }
 
 
@@ -41293,7 +41338,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1374:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
+    // xquery/XQueryParser.g:1376:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
     // $ANTLR start "p_PITest"
     p_PITest: function() {
         var retval = new XQueryParser.p_PITest_return();
@@ -41301,32 +41346,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PROCESSING_INSTRUCTION486 = null;
-        var LPAREN487 = null;
-        var RPAREN490 = null;
-         var p_NCName488 = null;
-         var p_StringLiteral489 = null;
+        var PROCESSING_INSTRUCTION473 = null;
+        var LPAREN474 = null;
+        var RPAREN477 = null;
+         var p_NCName475 = null;
+         var p_StringLiteral476 = null;
 
-        var PROCESSING_INSTRUCTION486_tree=null;
-        var LPAREN487_tree=null;
-        var RPAREN490_tree=null;
+        var PROCESSING_INSTRUCTION473_tree=null;
+        var LPAREN474_tree=null;
+        var RPAREN477_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1375:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
-            // xquery/XQueryParser.g:1375:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
+            // xquery/XQueryParser.g:1377:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
+            // xquery/XQueryParser.g:1377:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
             root_0 = this.adaptor.nil();
 
-            PROCESSING_INSTRUCTION486=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226); if (this.state.failed) return retval;
+            PROCESSING_INSTRUCTION473=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            PROCESSING_INSTRUCTION486_tree = this.adaptor.create(PROCESSING_INSTRUCTION486);
-            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION486_tree);
+            PROCESSING_INSTRUCTION473_tree = this.adaptor.create(PROCESSING_INSTRUCTION473);
+            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION473_tree);
             }
-            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10228); if (this.state.failed) return retval;
+            LPAREN474=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10276); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN487_tree = this.adaptor.create(LPAREN487);
-            this.adaptor.addChild(root_0, LPAREN487_tree);
+            LPAREN474_tree = this.adaptor.create(LPAREN474);
+            this.adaptor.addChild(root_0, LPAREN474_tree);
             }
-            // xquery/XQueryParser.g:1375:41: ( p_NCName | p_StringLiteral )?
+            // xquery/XQueryParser.g:1377:41: ( p_NCName | p_StringLiteral )?
             var alt167=3;
             var LA167_0 = this.input.LA(1);
 
@@ -41338,34 +41383,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt167) {
                 case 1 :
-                    // xquery/XQueryParser.g:1375:42: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10231);
-                    p_NCName488=this.p_NCName();
+                    // xquery/XQueryParser.g:1377:42: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10279);
+                    p_NCName475=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName488.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName475.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1375:53: p_StringLiteral
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10235);
-                    p_StringLiteral489=this.p_StringLiteral();
+                    // xquery/XQueryParser.g:1377:53: p_StringLiteral
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10283);
+                    p_StringLiteral476=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral489.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral476.getTree());
 
 
                     break;
 
             }
 
-            RPAREN490=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10239); if (this.state.failed) return retval;
+            RPAREN477=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10287); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN490_tree = this.adaptor.create(RPAREN490);
-            this.adaptor.addChild(root_0, RPAREN490_tree);
+            RPAREN477_tree = this.adaptor.create(RPAREN477);
+            this.adaptor.addChild(root_0, RPAREN477_tree);
             }
 
 
@@ -41403,7 +41448,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1379:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
+    // xquery/XQueryParser.g:1381:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
     // $ANTLR start "p_AttributeTest"
     p_AttributeTest: function() {
         var retval = new XQueryParser.p_AttributeTest_return();
@@ -41411,34 +41456,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTRIBUTE491 = null;
-        var LPAREN492 = null;
-        var COMMA494 = null;
-        var RPAREN496 = null;
-         var p_AttribNameOrWildcard493 = null;
-         var p_TypeName495 = null;
+        var ATTRIBUTE478 = null;
+        var LPAREN479 = null;
+        var COMMA481 = null;
+        var RPAREN483 = null;
+         var p_AttribNameOrWildcard480 = null;
+         var p_TypeName482 = null;
 
-        var ATTRIBUTE491_tree=null;
-        var LPAREN492_tree=null;
-        var COMMA494_tree=null;
-        var RPAREN496_tree=null;
+        var ATTRIBUTE478_tree=null;
+        var LPAREN479_tree=null;
+        var COMMA481_tree=null;
+        var RPAREN483_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1380:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
-            // xquery/XQueryParser.g:1380:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
+            // xquery/XQueryParser.g:1382:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
+            // xquery/XQueryParser.g:1382:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ATTRIBUTE491=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10265); if (this.state.failed) return retval;
+            ATTRIBUTE478=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10313); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ATTRIBUTE491_tree = this.adaptor.create(ATTRIBUTE491);
-            this.adaptor.addChild(root_0, ATTRIBUTE491_tree);
+            ATTRIBUTE478_tree = this.adaptor.create(ATTRIBUTE478);
+            this.adaptor.addChild(root_0, ATTRIBUTE478_tree);
             }
-            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10267); if (this.state.failed) return retval;
+            LPAREN479=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10315); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN492_tree = this.adaptor.create(LPAREN492);
-            this.adaptor.addChild(root_0, LPAREN492_tree);
+            LPAREN479_tree = this.adaptor.create(LPAREN479);
+            this.adaptor.addChild(root_0, LPAREN479_tree);
             }
-            // xquery/XQueryParser.g:1380:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
+            // xquery/XQueryParser.g:1382:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
             var alt169=2;
             var LA169_0 = this.input.LA(1);
 
@@ -41447,14 +41492,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt169) {
                 case 1 :
-                    // xquery/XQueryParser.g:1380:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270);
-                    p_AttribNameOrWildcard493=this.p_AttribNameOrWildcard();
+                    // xquery/XQueryParser.g:1382:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318);
+                    p_AttribNameOrWildcard480=this.p_AttribNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard493.getTree());
-                    // xquery/XQueryParser.g:1380:52: ( COMMA p_TypeName )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard480.getTree());
+                    // xquery/XQueryParser.g:1382:52: ( COMMA p_TypeName )?
                     var alt168=2;
                     var LA168_0 = this.input.LA(1);
 
@@ -41463,18 +41508,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt168) {
                         case 1 :
-                            // xquery/XQueryParser.g:1380:53: COMMA p_TypeName
-                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10273); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1382:53: COMMA p_TypeName
+                            COMMA481=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10321); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA494_tree = this.adaptor.create(COMMA494);
-                            this.adaptor.addChild(root_0, COMMA494_tree);
+                            COMMA481_tree = this.adaptor.create(COMMA481);
+                            this.adaptor.addChild(root_0, COMMA481_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10275);
-                            p_TypeName495=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10323);
+                            p_TypeName482=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName482.getTree());
 
 
                             break;
@@ -41487,10 +41532,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN496=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10281); if (this.state.failed) return retval;
+            RPAREN483=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10329); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN496_tree = this.adaptor.create(RPAREN496);
-            this.adaptor.addChild(root_0, RPAREN496_tree);
+            RPAREN483_tree = this.adaptor.create(RPAREN483);
+            this.adaptor.addChild(root_0, RPAREN483_tree);
             }
 
 
@@ -41528,7 +41573,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1384:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
+    // xquery/XQueryParser.g:1386:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
     // $ANTLR start "p_AttribNameOrWildcard"
     p_AttribNameOrWildcard: function() {
         var retval = new XQueryParser.p_AttribNameOrWildcard_return();
@@ -41536,13 +41581,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR498 = null;
-         var p_AttributeName497 = null;
+        var STAR485 = null;
+         var p_AttributeName484 = null;
 
-        var STAR498_tree=null;
+        var STAR485_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1385:9: ( p_AttributeName | STAR )
+            // xquery/XQueryParser.g:1387:9: ( p_AttributeName | STAR )
             var alt170=2;
             var LA170_0 = this.input.LA(1);
 
@@ -41561,26 +41606,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt170) {
                 case 1 :
-                    // xquery/XQueryParser.g:1385:11: p_AttributeName
+                    // xquery/XQueryParser.g:1387:11: p_AttributeName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309);
-                    p_AttributeName497=this.p_AttributeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357);
+                    p_AttributeName484=this.p_AttributeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName497.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName484.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1385:29: STAR
+                    // xquery/XQueryParser.g:1387:29: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR498=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10313); if (this.state.failed) return retval;
+                    STAR485=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10361); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR498_tree = this.adaptor.create(STAR498);
-                    this.adaptor.addChild(root_0, STAR498_tree);
+                    STAR485_tree = this.adaptor.create(STAR485);
+                    this.adaptor.addChild(root_0, STAR485_tree);
                     }
 
 
@@ -41620,7 +41665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1389:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1391:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
     // $ANTLR start "p_SchemaAttributeTest"
     p_SchemaAttributeTest: function() {
         var retval = new XQueryParser.p_SchemaAttributeTest_return();
@@ -41628,40 +41673,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ATTRIBUTE499 = null;
-        var LPAREN500 = null;
-        var RPAREN502 = null;
-         var p_AttributeDeclaration501 = null;
+        var SCHEMA_ATTRIBUTE486 = null;
+        var LPAREN487 = null;
+        var RPAREN489 = null;
+         var p_AttributeDeclaration488 = null;
 
-        var SCHEMA_ATTRIBUTE499_tree=null;
-        var LPAREN500_tree=null;
-        var RPAREN502_tree=null;
+        var SCHEMA_ATTRIBUTE486_tree=null;
+        var LPAREN487_tree=null;
+        var RPAREN489_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1390:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
-            // xquery/XQueryParser.g:1390:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
+            // xquery/XQueryParser.g:1392:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
+            // xquery/XQueryParser.g:1392:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ATTRIBUTE499=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339); if (this.state.failed) return retval;
+            SCHEMA_ATTRIBUTE486=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ATTRIBUTE499_tree = this.adaptor.create(SCHEMA_ATTRIBUTE499);
-            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE499_tree);
+            SCHEMA_ATTRIBUTE486_tree = this.adaptor.create(SCHEMA_ATTRIBUTE486);
+            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE486_tree);
             }
-            LPAREN500=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10341); if (this.state.failed) return retval;
+            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10389); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN500_tree = this.adaptor.create(LPAREN500);
-            this.adaptor.addChild(root_0, LPAREN500_tree);
+            LPAREN487_tree = this.adaptor.create(LPAREN487);
+            this.adaptor.addChild(root_0, LPAREN487_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343);
-            p_AttributeDeclaration501=this.p_AttributeDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391);
+            p_AttributeDeclaration488=this.p_AttributeDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration501.getTree());
-            RPAREN502=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration488.getTree());
+            RPAREN489=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN502_tree = this.adaptor.create(RPAREN502);
-            this.adaptor.addChild(root_0, RPAREN502_tree);
+            RPAREN489_tree = this.adaptor.create(RPAREN489);
+            this.adaptor.addChild(root_0, RPAREN489_tree);
             }
 
 
@@ -41699,7 +41744,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1394:1: p_AttributeDeclaration : p_AttributeName ;
+    // xquery/XQueryParser.g:1396:1: p_AttributeDeclaration : p_AttributeName ;
     // $ANTLR start "p_AttributeDeclaration"
     p_AttributeDeclaration: function() {
         var retval = new XQueryParser.p_AttributeDeclaration_return();
@@ -41707,20 +41752,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AttributeName503 = null;
+         var p_AttributeName490 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1395:9: ( p_AttributeName )
-            // xquery/XQueryParser.g:1395:11: p_AttributeName
+            // xquery/XQueryParser.g:1397:9: ( p_AttributeName )
+            // xquery/XQueryParser.g:1397:11: p_AttributeName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371);
-            p_AttributeName503=this.p_AttributeName();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419);
+            p_AttributeName490=this.p_AttributeName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName503.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName490.getTree());
 
 
 
@@ -41757,7 +41802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1399:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
+    // xquery/XQueryParser.g:1401:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
     // $ANTLR start "p_ElementTest"
     p_ElementTest: function() {
         var retval = new XQueryParser.p_ElementTest_return();
@@ -41765,36 +41810,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ELEMENT504 = null;
-        var LPAREN505 = null;
-        var COMMA507 = null;
-        var QUESTION509 = null;
-        var RPAREN510 = null;
-         var p_ElementNameOrWildcard506 = null;
-         var p_TypeName508 = null;
+        var ELEMENT491 = null;
+        var LPAREN492 = null;
+        var COMMA494 = null;
+        var QUESTION496 = null;
+        var RPAREN497 = null;
+         var p_ElementNameOrWildcard493 = null;
+         var p_TypeName495 = null;
 
-        var ELEMENT504_tree=null;
-        var LPAREN505_tree=null;
-        var COMMA507_tree=null;
-        var QUESTION509_tree=null;
-        var RPAREN510_tree=null;
+        var ELEMENT491_tree=null;
+        var LPAREN492_tree=null;
+        var COMMA494_tree=null;
+        var QUESTION496_tree=null;
+        var RPAREN497_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1400:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
-            // xquery/XQueryParser.g:1400:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
+            // xquery/XQueryParser.g:1402:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
+            // xquery/XQueryParser.g:1402:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ELEMENT504=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10397); if (this.state.failed) return retval;
+            ELEMENT491=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ELEMENT504_tree = this.adaptor.create(ELEMENT504);
-            this.adaptor.addChild(root_0, ELEMENT504_tree);
+            ELEMENT491_tree = this.adaptor.create(ELEMENT491);
+            this.adaptor.addChild(root_0, ELEMENT491_tree);
             }
-            LPAREN505=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10399); if (this.state.failed) return retval;
+            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10447); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN505_tree = this.adaptor.create(LPAREN505);
-            this.adaptor.addChild(root_0, LPAREN505_tree);
+            LPAREN492_tree = this.adaptor.create(LPAREN492);
+            this.adaptor.addChild(root_0, LPAREN492_tree);
             }
-            // xquery/XQueryParser.g:1400:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
+            // xquery/XQueryParser.g:1402:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
             var alt173=2;
             var LA173_0 = this.input.LA(1);
 
@@ -41803,14 +41848,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt173) {
                 case 1 :
-                    // xquery/XQueryParser.g:1400:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402);
-                    p_ElementNameOrWildcard506=this.p_ElementNameOrWildcard();
+                    // xquery/XQueryParser.g:1402:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450);
+                    p_ElementNameOrWildcard493=this.p_ElementNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard506.getTree());
-                    // xquery/XQueryParser.g:1400:51: ( COMMA p_TypeName ( QUESTION )? )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard493.getTree());
+                    // xquery/XQueryParser.g:1402:51: ( COMMA p_TypeName ( QUESTION )? )?
                     var alt172=2;
                     var LA172_0 = this.input.LA(1);
 
@@ -41819,19 +41864,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt172) {
                         case 1 :
-                            // xquery/XQueryParser.g:1400:52: COMMA p_TypeName ( QUESTION )?
-                            COMMA507=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10405); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1402:52: COMMA p_TypeName ( QUESTION )?
+                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10453); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA507_tree = this.adaptor.create(COMMA507);
-                            this.adaptor.addChild(root_0, COMMA507_tree);
+                            COMMA494_tree = this.adaptor.create(COMMA494);
+                            this.adaptor.addChild(root_0, COMMA494_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10407);
-                            p_TypeName508=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10455);
+                            p_TypeName495=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName508.getTree());
-                            // xquery/XQueryParser.g:1400:69: ( QUESTION )?
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            // xquery/XQueryParser.g:1402:69: ( QUESTION )?
                             var alt171=2;
                             var LA171_0 = this.input.LA(1);
 
@@ -41840,11 +41885,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt171) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1400:69: QUESTION
-                                    QUESTION509=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10409); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1402:69: QUESTION
+                                    QUESTION496=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10457); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    QUESTION509_tree = this.adaptor.create(QUESTION509);
-                                    this.adaptor.addChild(root_0, QUESTION509_tree);
+                                    QUESTION496_tree = this.adaptor.create(QUESTION496);
+                                    this.adaptor.addChild(root_0, QUESTION496_tree);
                                     }
 
 
@@ -41864,10 +41909,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN510=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10416); if (this.state.failed) return retval;
+            RPAREN497=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10464); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN510_tree = this.adaptor.create(RPAREN510);
-            this.adaptor.addChild(root_0, RPAREN510_tree);
+            RPAREN497_tree = this.adaptor.create(RPAREN497);
+            this.adaptor.addChild(root_0, RPAREN497_tree);
             }
 
 
@@ -41905,7 +41950,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1404:1: p_ElementNameOrWildcard : ( p_QName | STAR );
+    // xquery/XQueryParser.g:1406:1: p_ElementNameOrWildcard : ( p_QName | STAR );
     // $ANTLR start "p_ElementNameOrWildcard"
     p_ElementNameOrWildcard: function() {
         var retval = new XQueryParser.p_ElementNameOrWildcard_return();
@@ -41913,13 +41958,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR512 = null;
-         var p_QName511 = null;
+        var STAR499 = null;
+         var p_QName498 = null;
 
-        var STAR512_tree=null;
+        var STAR499_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1405:9: ( p_QName | STAR )
+            // xquery/XQueryParser.g:1407:9: ( p_QName | STAR )
             var alt174=2;
             var LA174_0 = this.input.LA(1);
 
@@ -41938,26 +41983,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt174) {
                 case 1 :
-                    // xquery/XQueryParser.g:1405:11: p_QName
+                    // xquery/XQueryParser.g:1407:11: p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10442);
-                    p_QName511=this.p_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10490);
+                    p_QName498=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName511.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName498.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1405:21: STAR
+                    // xquery/XQueryParser.g:1407:21: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR512=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10446); if (this.state.failed) return retval;
+                    STAR499=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR512_tree = this.adaptor.create(STAR512);
-                    this.adaptor.addChild(root_0, STAR512_tree);
+                    STAR499_tree = this.adaptor.create(STAR499);
+                    this.adaptor.addChild(root_0, STAR499_tree);
                     }
 
 
@@ -41997,7 +42042,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1408:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1410:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
     // $ANTLR start "p_SchemaElementTest"
     p_SchemaElementTest: function() {
         var retval = new XQueryParser.p_SchemaElementTest_return();
@@ -42005,40 +42050,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ELEMENT513 = null;
-        var LPAREN514 = null;
-        var RPAREN516 = null;
-         var p_ElementDeclaration515 = null;
+        var SCHEMA_ELEMENT500 = null;
+        var LPAREN501 = null;
+        var RPAREN503 = null;
+         var p_ElementDeclaration502 = null;
 
-        var SCHEMA_ELEMENT513_tree=null;
-        var LPAREN514_tree=null;
-        var RPAREN516_tree=null;
+        var SCHEMA_ELEMENT500_tree=null;
+        var LPAREN501_tree=null;
+        var RPAREN503_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1409:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
-            // xquery/XQueryParser.g:1409:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
+            // xquery/XQueryParser.g:1411:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
+            // xquery/XQueryParser.g:1411:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ELEMENT513=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464); if (this.state.failed) return retval;
+            SCHEMA_ELEMENT500=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ELEMENT513_tree = this.adaptor.create(SCHEMA_ELEMENT513);
-            this.adaptor.addChild(root_0, SCHEMA_ELEMENT513_tree);
+            SCHEMA_ELEMENT500_tree = this.adaptor.create(SCHEMA_ELEMENT500);
+            this.adaptor.addChild(root_0, SCHEMA_ELEMENT500_tree);
             }
-            LPAREN514=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10466); if (this.state.failed) return retval;
+            LPAREN501=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10514); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN514_tree = this.adaptor.create(LPAREN514);
-            this.adaptor.addChild(root_0, LPAREN514_tree);
+            LPAREN501_tree = this.adaptor.create(LPAREN501);
+            this.adaptor.addChild(root_0, LPAREN501_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468);
-            p_ElementDeclaration515=this.p_ElementDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516);
+            p_ElementDeclaration502=this.p_ElementDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration515.getTree());
-            RPAREN516=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10470); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration502.getTree());
+            RPAREN503=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN516_tree = this.adaptor.create(RPAREN516);
-            this.adaptor.addChild(root_0, RPAREN516_tree);
+            RPAREN503_tree = this.adaptor.create(RPAREN503);
+            this.adaptor.addChild(root_0, RPAREN503_tree);
             }
 
 
@@ -42076,7 +42121,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1413:1: p_ElementDeclaration : p_ElementName ;
+    // xquery/XQueryParser.g:1415:1: p_ElementDeclaration : p_ElementName ;
     // $ANTLR start "p_ElementDeclaration"
     p_ElementDeclaration: function() {
         var retval = new XQueryParser.p_ElementDeclaration_return();
@@ -42084,20 +42129,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ElementName517 = null;
+         var p_ElementName504 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1414:9: ( p_ElementName )
-            // xquery/XQueryParser.g:1414:11: p_ElementName
+            // xquery/XQueryParser.g:1416:9: ( p_ElementName )
+            // xquery/XQueryParser.g:1416:11: p_ElementName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10496);
-            p_ElementName517=this.p_ElementName();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10544);
+            p_ElementName504=this.p_ElementName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName517.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName504.getTree());
 
 
 
@@ -42134,7 +42179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1418:1: p_AttributeName : p_QName ;
+    // xquery/XQueryParser.g:1420:1: p_AttributeName : p_QName ;
     // $ANTLR start "p_AttributeName"
     p_AttributeName: function() {
         var retval = new XQueryParser.p_AttributeName_return();
@@ -42142,20 +42187,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName518 = null;
+         var p_QName505 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1419:9: ( p_QName )
-            // xquery/XQueryParser.g:1419:11: p_QName
+            // xquery/XQueryParser.g:1421:9: ( p_QName )
+            // xquery/XQueryParser.g:1421:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10522);
-            p_QName518=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10570);
+            p_QName505=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName518.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName505.getTree());
 
 
 
@@ -42192,7 +42237,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1423:1: p_ElementName : p_QName ;
+    // xquery/XQueryParser.g:1425:1: p_ElementName : p_QName ;
     // $ANTLR start "p_ElementName"
     p_ElementName: function() {
         var retval = new XQueryParser.p_ElementName_return();
@@ -42200,20 +42245,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName519 = null;
+         var p_QName506 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1424:9: ( p_QName )
-            // xquery/XQueryParser.g:1424:11: p_QName
+            // xquery/XQueryParser.g:1426:9: ( p_QName )
+            // xquery/XQueryParser.g:1426:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10548);
-            p_QName519=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10596);
+            p_QName506=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName519.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName506.getTree());
 
 
 
@@ -42250,7 +42295,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1428:1: p_TypeName : p_QName ;
+    // xquery/XQueryParser.g:1430:1: p_TypeName : p_QName ;
     // $ANTLR start "p_TypeName"
     p_TypeName: function() {
         var retval = new XQueryParser.p_TypeName_return();
@@ -42258,20 +42303,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName520 = null;
+         var p_QName507 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1429:9: ( p_QName )
-            // xquery/XQueryParser.g:1429:11: p_QName
+            // xquery/XQueryParser.g:1431:9: ( p_QName )
+            // xquery/XQueryParser.g:1431:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10574);
-            p_QName520=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10622);
+            p_QName507=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName520.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName507.getTree());
 
 
 
@@ -42308,7 +42353,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1433:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
+    // xquery/XQueryParser.g:1435:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
     // $ANTLR start "p_FunctionTest"
     p_FunctionTest: function() {
         var retval = new XQueryParser.p_FunctionTest_return();
@@ -42316,17 +42361,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Annotation521 = null;
-         var p_AnyFunctionTest522 = null;
-         var p_TypedFunctionTest523 = null;
+         var p_Annotation508 = null;
+         var p_AnyFunctionTest509 = null;
+         var p_TypedFunctionTest510 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1434:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )*
             loop175:
             do {
                 var alt175=2;
@@ -42339,13 +42384,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt175) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10600);
-                    p_Annotation521=this.p_Annotation();
+                    // xquery/XQueryParser.g:1436:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10648);
+                    p_Annotation508=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation521.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation508.getTree());
 
 
                     break;
@@ -42355,7 +42400,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:1434:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
             var alt176=2;
             var LA176_0 = this.input.LA(1);
 
@@ -42396,24 +42441,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt176) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:26: p_AnyFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604);
-                    p_AnyFunctionTest522=this.p_AnyFunctionTest();
+                    // xquery/XQueryParser.g:1436:26: p_AnyFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652);
+                    p_AnyFunctionTest509=this.p_AnyFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest522.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest509.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1434:46: p_TypedFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608);
-                    p_TypedFunctionTest523=this.p_TypedFunctionTest();
+                    // xquery/XQueryParser.g:1436:46: p_TypedFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656);
+                    p_TypedFunctionTest510=this.p_TypedFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest523.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest510.getTree());
 
 
                     break;
@@ -42456,7 +42501,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1438:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
+    // xquery/XQueryParser.g:1440:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
     // $ANTLR start "p_AnyFunctionTest"
     p_AnyFunctionTest: function() {
         var retval = new XQueryParser.p_AnyFunctionTest_return();
@@ -42464,40 +42509,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION524 = null;
-        var LPAREN525 = null;
-        var STAR526 = null;
-        var RPAREN527 = null;
+        var FUNCTION511 = null;
+        var LPAREN512 = null;
+        var STAR513 = null;
+        var RPAREN514 = null;
 
-        var FUNCTION524_tree=null;
-        var LPAREN525_tree=null;
-        var STAR526_tree=null;
-        var RPAREN527_tree=null;
+        var FUNCTION511_tree=null;
+        var LPAREN512_tree=null;
+        var STAR513_tree=null;
+        var RPAREN514_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1439:9: ( FUNCTION LPAREN STAR RPAREN )
-            // xquery/XQueryParser.g:1439:11: FUNCTION LPAREN STAR RPAREN
+            // xquery/XQueryParser.g:1441:9: ( FUNCTION LPAREN STAR RPAREN )
+            // xquery/XQueryParser.g:1441:11: FUNCTION LPAREN STAR RPAREN
             root_0 = this.adaptor.nil();
 
-            FUNCTION524=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10635); if (this.state.failed) return retval;
+            FUNCTION511=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10683); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION524_tree = this.adaptor.create(FUNCTION524);
-            this.adaptor.addChild(root_0, FUNCTION524_tree);
+            FUNCTION511_tree = this.adaptor.create(FUNCTION511);
+            this.adaptor.addChild(root_0, FUNCTION511_tree);
             }
-            LPAREN525=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10637); if (this.state.failed) return retval;
+            LPAREN512=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10685); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN525_tree = this.adaptor.create(LPAREN525);
-            this.adaptor.addChild(root_0, LPAREN525_tree);
+            LPAREN512_tree = this.adaptor.create(LPAREN512);
+            this.adaptor.addChild(root_0, LPAREN512_tree);
             }
-            STAR526=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10639); if (this.state.failed) return retval;
+            STAR513=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10687); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            STAR526_tree = this.adaptor.create(STAR526);
-            this.adaptor.addChild(root_0, STAR526_tree);
+            STAR513_tree = this.adaptor.create(STAR513);
+            this.adaptor.addChild(root_0, STAR513_tree);
             }
-            RPAREN527=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10641); if (this.state.failed) return retval;
+            RPAREN514=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10689); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN527_tree = this.adaptor.create(RPAREN527);
-            this.adaptor.addChild(root_0, RPAREN527_tree);
+            RPAREN514_tree = this.adaptor.create(RPAREN514);
+            this.adaptor.addChild(root_0, RPAREN514_tree);
             }
 
 
@@ -42535,7 +42580,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1443:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
+    // xquery/XQueryParser.g:1445:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
     // $ANTLR start "p_TypedFunctionTest"
     p_TypedFunctionTest: function() {
         var retval = new XQueryParser.p_TypedFunctionTest_return();
@@ -42543,37 +42588,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION528 = null;
-        var LPAREN529 = null;
-        var COMMA531 = null;
-        var RPAREN533 = null;
-        var AS534 = null;
-         var p_SequenceType530 = null;
-         var p_SequenceType532 = null;
-         var p_SequenceType535 = null;
+        var FUNCTION515 = null;
+        var LPAREN516 = null;
+        var COMMA518 = null;
+        var RPAREN520 = null;
+        var AS521 = null;
+         var p_SequenceType517 = null;
+         var p_SequenceType519 = null;
+         var p_SequenceType522 = null;
 
-        var FUNCTION528_tree=null;
-        var LPAREN529_tree=null;
-        var COMMA531_tree=null;
-        var RPAREN533_tree=null;
-        var AS534_tree=null;
+        var FUNCTION515_tree=null;
+        var LPAREN516_tree=null;
+        var COMMA518_tree=null;
+        var RPAREN520_tree=null;
+        var AS521_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1444:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
-            // xquery/XQueryParser.g:1444:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
+            // xquery/XQueryParser.g:1446:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
+            // xquery/XQueryParser.g:1446:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
             root_0 = this.adaptor.nil();
 
-            FUNCTION528=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10667); if (this.state.failed) return retval;
+            FUNCTION515=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10715); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION528_tree = this.adaptor.create(FUNCTION528);
-            this.adaptor.addChild(root_0, FUNCTION528_tree);
+            FUNCTION515_tree = this.adaptor.create(FUNCTION515);
+            this.adaptor.addChild(root_0, FUNCTION515_tree);
             }
-            LPAREN529=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10669); if (this.state.failed) return retval;
+            LPAREN516=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10717); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN529_tree = this.adaptor.create(LPAREN529);
-            this.adaptor.addChild(root_0, LPAREN529_tree);
+            LPAREN516_tree = this.adaptor.create(LPAREN516);
+            this.adaptor.addChild(root_0, LPAREN516_tree);
             }
-            // xquery/XQueryParser.g:1444:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
+            // xquery/XQueryParser.g:1446:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
             var alt178=2;
             var LA178_0 = this.input.LA(1);
 
@@ -42582,14 +42627,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt178) {
                 case 1 :
-                    // xquery/XQueryParser.g:1444:28: p_SequenceType ( COMMA p_SequenceType )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672);
-                    p_SequenceType530=this.p_SequenceType();
+                    // xquery/XQueryParser.g:1446:28: p_SequenceType ( COMMA p_SequenceType )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720);
+                    p_SequenceType517=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType530.getTree());
-                    // xquery/XQueryParser.g:1444:43: ( COMMA p_SequenceType )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType517.getTree());
+                    // xquery/XQueryParser.g:1446:43: ( COMMA p_SequenceType )*
                     loop177:
                     do {
                         var alt177=2;
@@ -42602,18 +42647,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt177) {
                         case 1 :
-                            // xquery/XQueryParser.g:1444:44: COMMA p_SequenceType
-                            COMMA531=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10675); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1446:44: COMMA p_SequenceType
+                            COMMA518=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10723); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA531_tree = this.adaptor.create(COMMA531);
-                            this.adaptor.addChild(root_0, COMMA531_tree);
+                            COMMA518_tree = this.adaptor.create(COMMA518);
+                            this.adaptor.addChild(root_0, COMMA518_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677);
-                            p_SequenceType532=this.p_SequenceType();
+                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725);
+                            p_SequenceType519=this.p_SequenceType();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType532.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType519.getTree());
 
 
                             break;
@@ -42629,22 +42674,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN533=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10683); if (this.state.failed) return retval;
+            RPAREN520=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10731); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN533_tree = this.adaptor.create(RPAREN533);
-            this.adaptor.addChild(root_0, RPAREN533_tree);
+            RPAREN520_tree = this.adaptor.create(RPAREN520);
+            this.adaptor.addChild(root_0, RPAREN520_tree);
             }
-            AS534=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10685); if (this.state.failed) return retval;
+            AS521=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            AS534_tree = this.adaptor.create(AS534);
-            this.adaptor.addChild(root_0, AS534_tree);
+            AS521_tree = this.adaptor.create(AS521);
+            this.adaptor.addChild(root_0, AS521_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687);
-            p_SequenceType535=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735);
+            p_SequenceType522=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType535.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType522.getTree());
 
 
 
@@ -42681,7 +42726,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1448:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
+    // xquery/XQueryParser.g:1450:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
     // $ANTLR start "p_ParenthesizedItemType"
     p_ParenthesizedItemType: function() {
         var retval = new XQueryParser.p_ParenthesizedItemType_return();
@@ -42689,33 +42734,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN536 = null;
-        var RPAREN538 = null;
-         var p_ItemType537 = null;
+        var LPAREN523 = null;
+        var RPAREN525 = null;
+         var p_ItemType524 = null;
 
-        var LPAREN536_tree=null;
-        var RPAREN538_tree=null;
+        var LPAREN523_tree=null;
+        var RPAREN525_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1449:9: ( LPAREN p_ItemType RPAREN )
-            // xquery/XQueryParser.g:1449:11: LPAREN p_ItemType RPAREN
+            // xquery/XQueryParser.g:1451:9: ( LPAREN p_ItemType RPAREN )
+            // xquery/XQueryParser.g:1451:11: LPAREN p_ItemType RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN536=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10713); if (this.state.failed) return retval;
+            LPAREN523=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10761); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN536_tree = this.adaptor.create(LPAREN536);
-            this.adaptor.addChild(root_0, LPAREN536_tree);
+            LPAREN523_tree = this.adaptor.create(LPAREN523);
+            this.adaptor.addChild(root_0, LPAREN523_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715);
-            p_ItemType537=this.p_ItemType();
+            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763);
+            p_ItemType524=this.p_ItemType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType537.getTree());
-            RPAREN538=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10717); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType524.getTree());
+            RPAREN525=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10765); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN538_tree = this.adaptor.create(RPAREN538);
-            this.adaptor.addChild(root_0, RPAREN538_tree);
+            RPAREN525_tree = this.adaptor.create(RPAREN525);
+            this.adaptor.addChild(root_0, RPAREN525_tree);
             }
 
 
@@ -42753,7 +42798,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1478:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
+    // xquery/XQueryParser.g:1480:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
     // $ANTLR start "p_StringLiteral"
     p_StringLiteral: function() {
         var retval = new XQueryParser.p_StringLiteral_return();
@@ -42761,23 +42806,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT539 = null;
-        var QUOT541 = null;
-        var APOS542 = null;
-        var APOS544 = null;
-         var pg_QuotStringLiteralContent540 = null;
-         var pg_AposStringLiteralContent543 = null;
+        var QUOT526 = null;
+        var QUOT528 = null;
+        var APOS529 = null;
+        var APOS531 = null;
+         var pg_QuotStringLiteralContent527 = null;
+         var pg_AposStringLiteralContent530 = null;
 
-        var QUOT539_tree=null;
-        var QUOT541_tree=null;
-        var APOS542_tree=null;
-        var APOS544_tree=null;
+        var QUOT526_tree=null;
+        var QUOT528_tree=null;
+        var APOS529_tree=null;
+        var APOS531_tree=null;
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token QUOT");
         var stream_pg_QuotStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_QuotStringLiteralContent");
         var stream_pg_AposStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_AposStringLiteralContent");
         try {
-            // xquery/XQueryParser.g:1479:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
+            // xquery/XQueryParser.g:1481:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
             var alt179=2;
             var LA179_0 = this.input.LA(1);
 
@@ -42796,21 +42841,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt179) {
                 case 1 :
-                    // xquery/XQueryParser.g:1479:11: QUOT pg_QuotStringLiteralContent QUOT
-                    QUOT539=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10768); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT539);
+                    // xquery/XQueryParser.g:1481:11: QUOT pg_QuotStringLiteralContent QUOT
+                    QUOT526=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10816); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT526);
 
                     if ( this.state.backtracking===0 ) {
                        this.pushStringLexer(false);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772);
-                    pg_QuotStringLiteralContent540=this.pg_QuotStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820);
+                    pg_QuotStringLiteralContent527=this.pg_QuotStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent540.getTree());
-                    QUOT541=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10774); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT541);
+                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent527.getTree());
+                    QUOT528=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10822); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT528);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -42828,14 +42873,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1480:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                    // 1482:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1480:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1480:36: ( pg_QuotStringLiteralContent )*
+                        // xquery/XQueryParser.g:1482:36: ( pg_QuotStringLiteralContent )*
                         while ( stream_pg_QuotStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_QuotStringLiteralContent.nextTree());
 
@@ -42851,21 +42896,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1481:11: APOS pg_AposStringLiteralContent APOS
-                    APOS542=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10813); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS542);
+                    // xquery/XQueryParser.g:1483:11: APOS pg_AposStringLiteralContent APOS
+                    APOS529=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10861); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS529);
 
                     if ( this.state.backtracking===0 ) {
                       this.pushStringLexer(true);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817);
-                    pg_AposStringLiteralContent543=this.pg_AposStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865);
+                    pg_AposStringLiteralContent530=this.pg_AposStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent543.getTree());
-                    APOS544=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10819); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS544);
+                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent530.getTree());
+                    APOS531=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10867); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS531);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -42883,14 +42928,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1482:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                    // 1484:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1484:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1482:36: ( pg_AposStringLiteralContent )*
+                        // xquery/XQueryParser.g:1484:36: ( pg_AposStringLiteralContent )*
                         while ( stream_pg_AposStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_AposStringLiteralContent.nextTree());
 
@@ -42941,7 +42986,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1488:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
+    // xquery/XQueryParser.g:1490:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
     // $ANTLR start "pg_QuotStringLiteralContent"
     pg_QuotStringLiteralContent: function() {
         var retval = new XQueryParser.pg_QuotStringLiteralContent_return();
@@ -42949,16 +42994,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set545 = null;
+        var set532 = null;
 
-        var set545_tree=null;
+        var set532_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1489:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             loop180:
             do {
                 var alt180=2;
@@ -42972,10 +43017,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt180) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set545=this.input.LT(1);
+                    set532=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=APOS)||(this.input.LA(1)>=NCNameStartChar && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set545));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set532));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -43029,7 +43074,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1496:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
+    // xquery/XQueryParser.g:1498:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
     // $ANTLR start "pg_AposStringLiteralContent"
     pg_AposStringLiteralContent: function() {
         var retval = new XQueryParser.pg_AposStringLiteralContent_return();
@@ -43037,16 +43082,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set546 = null;
+        var set533 = null;
 
-        var set546_tree=null;
+        var set533_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1497:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             loop181:
             do {
                 var alt181=2;
@@ -43060,10 +43105,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt181) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set546=this.input.LT(1);
+                    set533=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=CHARREF_HEX)||(this.input.LA(1)>=QUOT && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set546));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set533));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -43117,7 +43162,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1511:1: p_ElementContentChar : L_ElementContentChar ;
+    // xquery/XQueryParser.g:1513:1: p_ElementContentChar : L_ElementContentChar ;
     // $ANTLR start "p_ElementContentChar"
     p_ElementContentChar: function() {
         var retval = new XQueryParser.p_ElementContentChar_return();
@@ -43125,19 +43170,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_ElementContentChar547 = null;
+        var L_ElementContentChar534 = null;
 
-        var L_ElementContentChar547_tree=null;
+        var L_ElementContentChar534_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1512:9: ( L_ElementContentChar )
-            // xquery/XQueryParser.g:1512:11: L_ElementContentChar
+            // xquery/XQueryParser.g:1514:9: ( L_ElementContentChar )
+            // xquery/XQueryParser.g:1514:11: L_ElementContentChar
             root_0 = this.adaptor.nil();
 
-            L_ElementContentChar547=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994); if (this.state.failed) return retval;
+            L_ElementContentChar534=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_ElementContentChar547_tree = this.adaptor.create(L_ElementContentChar547);
-            this.adaptor.addChild(root_0, L_ElementContentChar547_tree);
+            L_ElementContentChar534_tree = this.adaptor.create(L_ElementContentChar534);
+            this.adaptor.addChild(root_0, L_ElementContentChar534_tree);
             }
 
 
@@ -43175,7 +43220,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1516:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
+    // xquery/XQueryParser.g:1518:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
     // $ANTLR start "p_QuotAttrContentChar"
     p_QuotAttrContentChar: function() {
         var retval = new XQueryParser.p_QuotAttrContentChar_return();
@@ -43183,16 +43228,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_QuotAttrContentChar548 = null;
+        var L_QuotAttrContentChar535 = null;
 
-        var L_QuotAttrContentChar548_tree=null;
+        var L_QuotAttrContentChar535_tree=null;
         var stream_L_QuotAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_QuotAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1517:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
-            // xquery/XQueryParser.g:1517:11: L_QuotAttrContentChar
-            L_QuotAttrContentChar548=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar548);
+            // xquery/XQueryParser.g:1519:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
+            // xquery/XQueryParser.g:1519:11: L_QuotAttrContentChar
+            L_QuotAttrContentChar535=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar535);
 
 
 
@@ -43207,9 +43252,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1518:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
+            // 1520:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
             {
-                // xquery/XQueryParser.g:1518:20: ^( AttributeValueChar L_QuotAttrContentChar )
+                // xquery/XQueryParser.g:1520:20: ^( AttributeValueChar L_QuotAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -43257,7 +43302,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1522:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
+    // xquery/XQueryParser.g:1524:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
     // $ANTLR start "p_AposAttrContentChar"
     p_AposAttrContentChar: function() {
         var retval = new XQueryParser.p_AposAttrContentChar_return();
@@ -43265,16 +43310,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_AposAttrContentChar549 = null;
+        var L_AposAttrContentChar536 = null;
 
-        var L_AposAttrContentChar549_tree=null;
+        var L_AposAttrContentChar536_tree=null;
         var stream_L_AposAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_AposAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1523:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
-            // xquery/XQueryParser.g:1523:11: L_AposAttrContentChar
-            L_AposAttrContentChar549=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar549);
+            // xquery/XQueryParser.g:1525:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
+            // xquery/XQueryParser.g:1525:11: L_AposAttrContentChar
+            L_AposAttrContentChar536=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar536);
 
 
 
@@ -43289,9 +43334,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1524:17: -> ^( AttributeValueChar L_AposAttrContentChar )
+            // 1526:17: -> ^( AttributeValueChar L_AposAttrContentChar )
             {
-                // xquery/XQueryParser.g:1524:20: ^( AttributeValueChar L_AposAttrContentChar )
+                // xquery/XQueryParser.g:1526:20: ^( AttributeValueChar L_AposAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -43339,7 +43384,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1542:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
+    // xquery/XQueryParser.g:1544:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
     // $ANTLR start "p_QName"
     p_QName: function() {
         var retval = new XQueryParser.p_QName_return();
@@ -43347,13 +43392,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName550 = null;
-         var p_NCName551 = null;
+         var pg_QName537 = null;
+         var p_NCName538 = null;
 
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:1544:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
+            // xquery/XQueryParser.g:1546:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
             var alt182=2;
             var LA182_0 = this.input.LA(1);
 
@@ -43383,26 +43428,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt182) {
                 case 1 :
-                    // xquery/XQueryParser.g:1544:11: pg_QName
+                    // xquery/XQueryParser.g:1546:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11156);
-                    pg_QName550=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11204);
+                    pg_QName537=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName550.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName537.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1545:11: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11168);
-                    p_NCName551=this.p_NCName();
+                    // xquery/XQueryParser.g:1547:11: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11216);
+                    p_NCName538=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName551.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName538.getTree());
 
 
                     // AST REWRITE
@@ -43416,9 +43461,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1546:17: -> ^( QName p_NCName )
+                    // 1548:17: -> ^( QName p_NCName )
                     {
-                        // xquery/XQueryParser.g:1546:20: ^( QName p_NCName )
+                        // xquery/XQueryParser.g:1548:20: ^( QName p_NCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43469,7 +43514,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1550:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
+    // xquery/XQueryParser.g:1552:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
     // $ANTLR start "pg_FQName"
     pg_FQName: function() {
         var retval = new XQueryParser.pg_FQName_return();
@@ -43477,12 +43522,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName552 = null;
-         var p_FNCName553 = null;
+         var pg_QName539 = null;
+         var p_FNCName540 = null;
 
         var stream_p_FNCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_FNCName");
         try {
-            // xquery/XQueryParser.g:1551:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
+            // xquery/XQueryParser.g:1553:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
             var alt183=2;
             switch ( this.input.LA(1) ) {
             case ANCESTOR:
@@ -43721,26 +43766,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt183) {
                 case 1 :
-                    // xquery/XQueryParser.g:1551:11: pg_QName
+                    // xquery/XQueryParser.g:1553:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11229);
-                    pg_QName552=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11277);
+                    pg_QName539=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName552.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName539.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1552:11: p_FNCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11241);
-                    p_FNCName553=this.p_FNCName();
+                    // xquery/XQueryParser.g:1554:11: p_FNCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11289);
+                    p_FNCName540=this.p_FNCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName553.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName540.getTree());
 
 
                     // AST REWRITE
@@ -43754,9 +43799,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1553:17: -> ^( QName p_FNCName )
+                    // 1555:17: -> ^( QName p_FNCName )
                     {
-                        // xquery/XQueryParser.g:1553:20: ^( QName p_FNCName )
+                        // xquery/XQueryParser.g:1555:20: ^( QName p_FNCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43806,7 +43851,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1555:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
+    // xquery/XQueryParser.g:1557:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
     // $ANTLR start "pg_QName"
     pg_QName: function() {
         var retval = new XQueryParser.pg_QName_return();
@@ -43814,26 +43859,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COLON554 = null;
+        var COLON541 = null;
          var nn = null;
          var nl = null;
 
-        var COLON554_tree=null;
+        var COLON541_tree=null;
         var stream_COLON=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COLON");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:1556:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
-            // xquery/XQueryParser.g:1556:11: nn= p_NCName COLON nl= p_NCName
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11285);
+            // xquery/XQueryParser.g:1558:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
+            // xquery/XQueryParser.g:1558:11: nn= p_NCName COLON nl= p_NCName
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11333);
             nn=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_NCName.add(nn.getTree());
-            COLON554=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11287); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_COLON.add(COLON554);
+            COLON541=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11335); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_COLON.add(COLON541);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11291);
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11339);
             nl=this.p_NCName();
 
             this.state._fsp--;
@@ -43842,7 +43887,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nl, nn
+            // elements: nn, nl
             // token labels: 
             // rule labels: retval, nn, nl
             // token list labels: 
@@ -43854,9 +43899,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_nl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nl",nl!=null?nl.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1557:17: -> ^( QName $nn $nl)
+            // 1559:17: -> ^( QName $nn $nl)
             {
-                // xquery/XQueryParser.g:1557:20: ^( QName $nn $nl)
+                // xquery/XQueryParser.g:1559:20: ^( QName $nn $nl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43905,7 +43950,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1587:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1589:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_NCName"
     p_NCName: function() {
         var retval = new XQueryParser.p_NCName_return();
@@ -43913,19 +43958,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set555 = null;
+        var set542 = null;
 
-        var set555_tree=null;
+        var set542_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1588:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1590:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set555=this.input.LT(1);
+            set542=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=SKIP)||(this.input.LA(1)>=VALUE && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set555));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set542));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -43970,7 +44015,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1606:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1608:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_FNCName"
     p_FNCName: function() {
         var retval = new XQueryParser.p_FNCName_return();
@@ -43978,19 +44023,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set556 = null;
+        var set543 = null;
 
-        var set556_tree=null;
+        var set543_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1607:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1609:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set556=this.input.LT(1);
+            set543=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=AT)||(this.input.LA(1)>=BASE_URI && this.input.LA(1)<=COLLATION)||(this.input.LA(1)>=CONSTRUCTION && this.input.LA(1)<=DOCUMENT)||(this.input.LA(1)>=ELSE && this.input.LA(1)<=EMPTY)||(this.input.LA(1)>=ENCODING && this.input.LA(1)<=IDIV)||(this.input.LA(1)>=IMPORT && this.input.LA(1)<=IS)||(this.input.LA(1)>=LAX && this.input.LA(1)<=NO_PRESERVE)||(this.input.LA(1)>=OF && this.input.LA(1)<=PRESERVE)||(this.input.LA(1)>=RETURN && this.input.LA(1)<=SCHEMA)||(this.input.LA(1)>=SELF && this.input.LA(1)<=STRIP)||(this.input.LA(1)>=THEN && this.input.LA(1)<=TREAT)||(this.input.LA(1)>=UNION && this.input.LA(1)<=MINUS_SIGN)||(this.input.LA(1)>=NAN && this.input.LA(1)<=START)||(this.input.LA(1)>=TRY && this.input.LA(1)<=RETURNING)||(this.input.LA(1)>=CHECK && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set556));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set543));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -44035,7 +44080,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1644:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
+    // xquery/XQueryParser.g:1646:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
     // $ANTLR start "pg_UpdateExpr"
     pg_UpdateExpr: function() {
         var retval = new XQueryParser.pg_UpdateExpr_return();
@@ -44043,15 +44088,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InsertExpr557 = null;
-         var p_DeleteExpr558 = null;
-         var p_RenameExpr559 = null;
-         var p_ReplaceExpr560 = null;
-         var p_TransformExpr561 = null;
+         var p_InsertExpr544 = null;
+         var p_DeleteExpr545 = null;
+         var p_RenameExpr546 = null;
+         var p_ReplaceExpr547 = null;
+         var p_TransformExpr548 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1645:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
+            // xquery/XQueryParser.g:1647:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
             var alt184=5;
             switch ( this.input.LA(1) ) {
             case INSERT:
@@ -44079,67 +44124,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt184) {
                 case 1 :
-                    // xquery/XQueryParser.g:1645:11: p_InsertExpr
+                    // xquery/XQueryParser.g:1647:11: p_InsertExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282);
-                    p_InsertExpr557=this.p_InsertExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330);
+                    p_InsertExpr544=this.p_InsertExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr557.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr544.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1646:11: p_DeleteExpr
+                    // xquery/XQueryParser.g:1648:11: p_DeleteExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294);
-                    p_DeleteExpr558=this.p_DeleteExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342);
+                    p_DeleteExpr545=this.p_DeleteExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr558.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr545.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1647:11: p_RenameExpr
+                    // xquery/XQueryParser.g:1649:11: p_RenameExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306);
-                    p_RenameExpr559=this.p_RenameExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354);
+                    p_RenameExpr546=this.p_RenameExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr559.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr546.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1648:11: p_ReplaceExpr
+                    // xquery/XQueryParser.g:1650:11: p_ReplaceExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318);
-                    p_ReplaceExpr560=this.p_ReplaceExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366);
+                    p_ReplaceExpr547=this.p_ReplaceExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr560.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr547.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1649:11: p_TransformExpr
+                    // xquery/XQueryParser.g:1651:11: p_TransformExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330);
-                    p_TransformExpr561=this.p_TransformExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378);
+                    p_TransformExpr548=this.p_TransformExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr561.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr548.getTree());
 
 
                     break;
@@ -44178,7 +44223,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1653:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
+    // xquery/XQueryParser.g:1655:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
     // $ANTLR start "pm_RevalidationDecl"
     pm_RevalidationDecl: function() {
         var retval = new XQueryParser.pm_RevalidationDecl_return();
@@ -44186,19 +44231,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON562 = null;
+        var SEMICOLON549 = null;
         var k = null;
         var list_k=null;
 
-        var SEMICOLON562_tree=null;
+        var SEMICOLON549_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1654:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
-            // xquery/XQueryParser.g:1654:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
+            // xquery/XQueryParser.g:1656:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
+            // xquery/XQueryParser.g:1656:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13358); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13406); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44206,7 +44251,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362); if (this.state.failed) return retval;
+            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44214,7 +44259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1654:38: (k+= STRICT | k+= LAX | k+= SKIP )
+            // xquery/XQueryParser.g:1656:38: (k+= STRICT | k+= LAX | k+= SKIP )
             var alt185=3;
             switch ( this.input.LA(1) ) {
             case STRICT:
@@ -44236,8 +44281,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt185) {
                 case 1 :
-                    // xquery/XQueryParser.g:1654:39: k+= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:39: k+= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44249,8 +44294,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1654:51: k+= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13373); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:51: k+= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13421); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44262,8 +44307,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1654:60: k+= SKIP
-                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13379); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:60: k+= SKIP
+                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13427); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44280,10 +44325,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            SEMICOLON562=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384); if (this.state.failed) return retval;
+            SEMICOLON549=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON562_tree = this.adaptor.create(SEMICOLON562);
-            this.adaptor.addChild(root_0, SEMICOLON562_tree);
+            SEMICOLON549_tree = this.adaptor.create(SEMICOLON549);
+            this.adaptor.addChild(root_0, SEMICOLON549_tree);
             }
 
 
@@ -44321,7 +44366,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1658:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
+    // xquery/XQueryParser.g:1660:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
     // $ANTLR start "p_InsertExprTargetChoice"
     p_InsertExprTargetChoice: function() {
         var retval = new XQueryParser.p_InsertExprTargetChoice_return();
@@ -44339,7 +44384,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1659:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
+            // xquery/XQueryParser.g:1661:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
             var alt188=3;
             switch ( this.input.LA(1) ) {
             case AS:
@@ -44362,12 +44407,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt188) {
                 case 1 :
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )?
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )?
                     var alt187=2;
                     var LA187_0 = this.input.LA(1);
 
@@ -44376,8 +44421,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt187) {
                         case 1 :
-                            // xquery/XQueryParser.g:1659:13: k+= AS (k+= FIRST | k+= LAST )
-                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13414); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1661:13: k+= AS (k+= FIRST | k+= LAST )
+                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13462); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -44385,7 +44430,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if (org.antlr.lang.isNull(list_k)) list_k = [];
                             list_k.push(k);
 
-                            // xquery/XQueryParser.g:1659:19: (k+= FIRST | k+= LAST )
+                            // xquery/XQueryParser.g:1661:19: (k+= FIRST | k+= LAST )
                             var alt186=2;
                             var LA186_0 = this.input.LA(1);
 
@@ -44404,8 +44449,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt186) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1659:20: k+= FIRST
-                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13419); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:20: k+= FIRST
+                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13467); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -44417,8 +44462,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:1659:31: k+= LAST
-                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13425); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:31: k+= LAST
+                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13473); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -44438,7 +44483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13432); if (this.state.failed) return retval;
+                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44456,10 +44501,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1660:11: ka= AFTER
+                    // xquery/XQueryParser.g:1662:11: ka= AFTER
                     root_0 = this.adaptor.nil();
 
-                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13449); if (this.state.failed) return retval;
+                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13497); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -44471,10 +44516,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1661:11: kb= BEFORE
+                    // xquery/XQueryParser.g:1663:11: kb= BEFORE
                     root_0 = this.adaptor.nil();
 
-                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465); if (this.state.failed) return retval;
+                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kb_tree = this.adaptor.create(kb);
                     this.adaptor.addChild(root_0, kb_tree);
@@ -44520,7 +44565,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1665:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
+    // xquery/XQueryParser.g:1667:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
     // $ANTLR start "p_InsertExpr"
     p_InsertExpr: function() {
         var retval = new XQueryParser.p_InsertExpr_return();
@@ -44530,18 +44575,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_SourceExpr563 = null;
-         var p_InsertExprTargetChoice564 = null;
-         var p_TargetExpr565 = null;
+         var p_SourceExpr550 = null;
+         var p_InsertExprTargetChoice551 = null;
+         var p_TargetExpr552 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1666:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
-            // xquery/XQueryParser.g:1666:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
+            // xquery/XQueryParser.g:1668:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
+            // xquery/XQueryParser.g:1668:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13495); if (this.state.failed) return retval;
+            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13543); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44549,7 +44594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1666:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1668:21: (k+= NODE | k+= NODES )
             var alt189=2;
             var LA189_0 = this.input.LA(1);
 
@@ -44568,8 +44613,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt189) {
                 case 1 :
-                    // xquery/XQueryParser.g:1666:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13500); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44581,8 +44626,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1666:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13506); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13554); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44596,24 +44641,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13509);
-            p_SourceExpr563=this.p_SourceExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13557);
+            p_SourceExpr550=this.p_SourceExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr563.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511);
-            p_InsertExprTargetChoice564=this.p_InsertExprTargetChoice();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr550.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559);
+            p_InsertExprTargetChoice551=this.p_InsertExprTargetChoice();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice564.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13513);
-            p_TargetExpr565=this.p_TargetExpr();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice551.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13561);
+            p_TargetExpr552=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr565.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr552.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44653,7 +44698,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1670:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
+    // xquery/XQueryParser.g:1672:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
     // $ANTLR start "p_DeleteExpr"
     p_DeleteExpr: function() {
         var retval = new XQueryParser.p_DeleteExpr_return();
@@ -44663,16 +44708,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr566 = null;
+         var p_TargetExpr553 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1671:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
-            // xquery/XQueryParser.g:1671:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
+            // xquery/XQueryParser.g:1673:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
+            // xquery/XQueryParser.g:1673:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13543); if (this.state.failed) return retval;
+            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13591); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44680,7 +44725,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1671:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1673:21: (k+= NODE | k+= NODES )
             var alt190=2;
             var LA190_0 = this.input.LA(1);
 
@@ -44699,8 +44744,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt190) {
                 case 1 :
-                    // xquery/XQueryParser.g:1671:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13596); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44712,8 +44757,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1671:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13554); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44727,12 +44772,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13557);
-            p_TargetExpr566=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13605);
+            p_TargetExpr553=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr566.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr553.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44772,7 +44817,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1675:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1677:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
     // $ANTLR start "p_ReplaceExpr"
     p_ReplaceExpr: function() {
         var retval = new XQueryParser.p_ReplaceExpr_return();
@@ -44782,17 +44827,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_ExprSingle567 = null;
-         var p_ExprSingle568 = null;
+         var p_ExprSingle554 = null;
+         var p_ExprSingle555 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1676:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1676:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
+            // xquery/XQueryParser.g:1678:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1678:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13587); if (this.state.failed) return retval;
+            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13635); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44800,7 +44845,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1676:22: (k+= VALUE k+= OF )?
+            // xquery/XQueryParser.g:1678:22: (k+= VALUE k+= OF )?
             var alt191=2;
             var LA191_0 = this.input.LA(1);
 
@@ -44809,8 +44854,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt191) {
                 case 1 :
-                    // xquery/XQueryParser.g:1676:23: k+= VALUE k+= OF
-                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13592); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1678:23: k+= VALUE k+= OF
+                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13640); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44818,7 +44863,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13596); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13644); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44832,7 +44877,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13602); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44840,13 +44885,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604);
-            p_ExprSingle567=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652);
+            p_ExprSingle554=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
-            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13609); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle554.getTree());
+            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44854,12 +44899,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611);
-            p_ExprSingle568=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659);
+            p_ExprSingle555=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle568.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle555.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44899,7 +44944,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1680:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
+    // xquery/XQueryParser.g:1682:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
     // $ANTLR start "p_RenameExpr"
     p_RenameExpr: function() {
         var retval = new XQueryParser.p_RenameExpr_return();
@@ -44909,17 +44954,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr569 = null;
-         var p_NewNameExpr570 = null;
+         var p_TargetExpr556 = null;
+         var p_NewNameExpr557 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1681:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
-            // xquery/XQueryParser.g:1681:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
+            // xquery/XQueryParser.g:1683:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
+            // xquery/XQueryParser.g:1683:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13642); if (this.state.failed) return retval;
+            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13690); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44927,7 +44972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13646); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13694); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44935,13 +44980,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13648);
-            p_TargetExpr569=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13696);
+            p_TargetExpr556=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr569.getTree());
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13652); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr556.getTree());
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44949,12 +44994,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13654);
-            p_NewNameExpr570=this.p_NewNameExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13702);
+            p_NewNameExpr557=this.p_NewNameExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr570.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr557.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44994,7 +45039,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1685:1: p_SourceExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1687:1: p_SourceExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_SourceExpr"
     p_SourceExpr: function() {
         var retval = new XQueryParser.p_SourceExpr_return();
@@ -45002,20 +45047,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle571 = null;
+         var p_ExprSingle558 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1686:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1686:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1688:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1688:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13682);
-            p_ExprSingle571=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13730);
+            p_ExprSingle558=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle571.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle558.getTree());
 
 
 
@@ -45052,7 +45097,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1690:1: p_TargetExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1692:1: p_TargetExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_TargetExpr"
     p_TargetExpr: function() {
         var retval = new XQueryParser.p_TargetExpr_return();
@@ -45060,20 +45105,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle572 = null;
+         var p_ExprSingle559 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1691:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1691:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1693:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1693:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13709);
-            p_ExprSingle572=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13757);
+            p_ExprSingle559=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle572.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle559.getTree());
 
 
 
@@ -45110,7 +45155,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1695:1: p_NewNameExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1697:1: p_NewNameExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_NewNameExpr"
     p_NewNameExpr: function() {
         var retval = new XQueryParser.p_NewNameExpr_return();
@@ -45118,20 +45163,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle573 = null;
+         var p_ExprSingle560 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1696:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1696:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1698:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1698:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13736);
-            p_ExprSingle573=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13784);
+            p_ExprSingle560=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle573.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle560.getTree());
 
 
 
@@ -45168,7 +45213,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1700:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1702:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
     // $ANTLR start "p_TransformExpr"
     p_TransformExpr: function() {
         var retval = new XQueryParser.p_TransformExpr_return();
@@ -45178,31 +45223,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var e = null;
-        var BIND574 = null;
-        var COMMA576 = null;
-        var BIND577 = null;
+        var BIND561 = null;
+        var COMMA563 = null;
+        var BIND564 = null;
         var k = null;
         var list_k=null;
          var v = null;
          var w = null;
-         var p_ExprSingle575 = null;
-         var p_ExprSingle578 = null;
-         var p_ExprSingle579 = null;
-         var p_ExprSingle580 = null;
+         var p_ExprSingle562 = null;
+         var p_ExprSingle565 = null;
+         var p_ExprSingle566 = null;
+         var p_ExprSingle567 = null;
 
         var d_tree=null;
         var e_tree=null;
-        var BIND574_tree=null;
-        var COMMA576_tree=null;
-        var BIND577_tree=null;
+        var BIND561_tree=null;
+        var COMMA563_tree=null;
+        var BIND564_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1701:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1701:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
+            // xquery/XQueryParser.g:1703:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1703:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13765); if (this.state.failed) return retval;
+            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13813); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45210,12 +45255,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13769); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13817); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13773);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13821);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -45224,18 +45269,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND574=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13777); if (this.state.failed) return retval;
+            BIND561=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13825); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND574_tree = this.adaptor.create(BIND574);
-            this.adaptor.addChild(root_0, BIND574_tree);
+            BIND561_tree = this.adaptor.create(BIND561);
+            this.adaptor.addChild(root_0, BIND561_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13779);
-            p_ExprSingle575=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13827);
+            p_ExprSingle562=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle575.getTree());
-            // xquery/XQueryParser.g:1701:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle562.getTree());
+            // xquery/XQueryParser.g:1703:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
             loop192:
             do {
                 var alt192=2;
@@ -45248,18 +45293,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt192) {
                 case 1 :
-                    // xquery/XQueryParser.g:1701:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
-                    COMMA576=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13783); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1703:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
+                    COMMA563=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13831); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA576_tree = this.adaptor.create(COMMA576);
-                    this.adaptor.addChild(root_0, COMMA576_tree);
+                    COMMA563_tree = this.adaptor.create(COMMA563);
+                    this.adaptor.addChild(root_0, COMMA563_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13787); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13835); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13791);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13839);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -45268,17 +45313,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    BIND577=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13795); if (this.state.failed) return retval;
+                    BIND564=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13843); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND577_tree = this.adaptor.create(BIND577);
-                    this.adaptor.addChild(root_0, BIND577_tree);
+                    BIND564_tree = this.adaptor.create(BIND564);
+                    this.adaptor.addChild(root_0, BIND564_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13797);
-                    p_ExprSingle578=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13845);
+                    p_ExprSingle565=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle578.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle565.getTree());
 
 
                     break;
@@ -45288,7 +45333,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13804); if (this.state.failed) return retval;
+            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13852); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45296,13 +45341,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13806);
-            p_ExprSingle579=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13854);
+            p_ExprSingle566=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle579.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13811); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle566.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13859); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45310,12 +45355,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13813);
-            p_ExprSingle580=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13861);
+            p_ExprSingle567=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle580.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -45355,7 +45400,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1711:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
+    // xquery/XQueryParser.g:1713:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
     // $ANTLR start "pm_FTOptionDecl"
     pm_FTOptionDecl: function() {
         var retval = new XQueryParser.pm_FTOptionDecl_return();
@@ -45363,20 +45408,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON582 = null;
+        var SEMICOLON569 = null;
         var k = null;
         var list_k=null;
-         var p_FTMatchOptions581 = null;
+         var p_FTMatchOptions568 = null;
 
-        var SEMICOLON582_tree=null;
+        var SEMICOLON569_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1712:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
-            // xquery/XQueryParser.g:1712:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
+            // xquery/XQueryParser.g:1714:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
+            // xquery/XQueryParser.g:1714:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13851); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13899); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45384,7 +45429,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855); if (this.state.failed) return retval;
+            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45392,16 +45437,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857);
-            p_FTMatchOptions581=this.p_FTMatchOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905);
+            p_FTMatchOptions568=this.p_FTMatchOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions581.getTree());
-            SEMICOLON582=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions568.getTree());
+            SEMICOLON569=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON582_tree = this.adaptor.create(SEMICOLON582);
-            this.adaptor.addChild(root_0, SEMICOLON582_tree);
+            SEMICOLON569_tree = this.adaptor.create(SEMICOLON569);
+            this.adaptor.addChild(root_0, SEMICOLON569_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
@@ -45442,7 +45487,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1716:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1718:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_FTScoreVar"
     p_FTScoreVar: function() {
         var retval = new XQueryParser.p_FTScoreVar_return();
@@ -45458,11 +45503,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1717:9: (ks= SCORE d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1717:11: ks= SCORE d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1719:9: (ks= SCORE d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1719:11: ks= SCORE d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13889); if (this.state.failed) return retval;
+            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ks_tree = this.adaptor.create(ks);
             this.adaptor.addChild(root_0, ks_tree);
@@ -45470,12 +45515,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ks);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13895); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13943); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13899);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13947);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -45520,7 +45565,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1721:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
+    // xquery/XQueryParser.g:1723:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
     // $ANTLR start "p_FTContainsExpr"
     p_FTContainsExpr: function() {
         var retval = new XQueryParser.p_FTContainsExpr_return();
@@ -45530,24 +45575,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringConcatExpr583 = null;
-         var p_FTSelection584 = null;
-         var p_FTIgnoreOption585 = null;
+         var p_StringConcatExpr570 = null;
+         var p_FTSelection571 = null;
+         var p_FTIgnoreOption572 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1722:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
-            // xquery/XQueryParser.g:1722:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            // xquery/XQueryParser.g:1724:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
+            // xquery/XQueryParser.g:1724:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927);
-            p_StringConcatExpr583=this.p_StringConcatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975);
+            p_StringConcatExpr570=this.p_StringConcatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr583.getTree());
-            // xquery/XQueryParser.g:1722:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr570.getTree());
+            // xquery/XQueryParser.g:1724:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             var alt194=2;
             var LA194_0 = this.input.LA(1);
 
@@ -45556,8 +45601,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt194) {
                 case 1 :
-                    // xquery/XQueryParser.g:1722:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
-                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13933); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1724:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
+                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13981); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -45565,7 +45610,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13937); if (this.state.failed) return retval;
+                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -45576,13 +45621,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13941);
-                    p_FTSelection584=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13989);
+                    p_FTSelection571=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection584.getTree());
-                    // xquery/XQueryParser.g:1722:81: ( p_FTIgnoreOption )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection571.getTree());
+                    // xquery/XQueryParser.g:1724:81: ( p_FTIgnoreOption )?
                     var alt193=2;
                     var LA193_0 = this.input.LA(1);
 
@@ -45591,13 +45636,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt193) {
                         case 1 :
-                            // xquery/XQueryParser.g:1722:81: p_FTIgnoreOption
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943);
-                            p_FTIgnoreOption585=this.p_FTIgnoreOption();
+                            // xquery/XQueryParser.g:1724:81: p_FTIgnoreOption
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991);
+                            p_FTIgnoreOption572=this.p_FTIgnoreOption();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption585.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption572.getTree());
 
 
                             break;
@@ -45646,7 +45691,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1726:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
+    // xquery/XQueryParser.g:1728:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
     // $ANTLR start "p_FTSelection"
     p_FTSelection: function() {
         var retval = new XQueryParser.p_FTSelection_return();
@@ -45654,22 +45699,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOr586 = null;
-         var p_FTPosFilter587 = null;
+         var p_FTOr573 = null;
+         var p_FTPosFilter574 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1727:9: ( p_FTOr ( p_FTPosFilter )* )
-            // xquery/XQueryParser.g:1727:11: p_FTOr ( p_FTPosFilter )*
+            // xquery/XQueryParser.g:1729:9: ( p_FTOr ( p_FTPosFilter )* )
+            // xquery/XQueryParser.g:1729:11: p_FTOr ( p_FTPosFilter )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection13973);
-            p_FTOr586=this.p_FTOr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection14021);
+            p_FTOr573=this.p_FTOr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr586.getTree());
-            // xquery/XQueryParser.g:1727:18: ( p_FTPosFilter )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr573.getTree());
+            // xquery/XQueryParser.g:1729:18: ( p_FTPosFilter )*
             loop195:
             do {
                 var alt195=2;
@@ -45682,13 +45727,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt195) {
                 case 1 :
-                    // xquery/XQueryParser.g:1727:18: p_FTPosFilter
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection13975);
-                    p_FTPosFilter587=this.p_FTPosFilter();
+                    // xquery/XQueryParser.g:1729:18: p_FTPosFilter
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection14023);
+                    p_FTPosFilter574=this.p_FTPosFilter();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter587.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter574.getTree());
 
 
                     break;
@@ -45734,7 +45779,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1731:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1733:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_FTWeight"
     p_FTWeight: function() {
         var retval = new XQueryParser.p_FTWeight_return();
@@ -45743,20 +45788,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-        var LBRACKET588 = null;
-        var RBRACKET590 = null;
-         var p_Expr589 = null;
+        var LBRACKET575 = null;
+        var RBRACKET577 = null;
+         var p_Expr576 = null;
 
         var kw_tree=null;
-        var LBRACKET588_tree=null;
-        var RBRACKET590_tree=null;
+        var LBRACKET575_tree=null;
+        var RBRACKET577_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1732:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1732:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1734:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1734:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14004); if (this.state.failed) return retval;
+            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14052); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -45764,21 +45809,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            LBRACKET588=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14008); if (this.state.failed) return retval;
+            LBRACKET575=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14056); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET588_tree = this.adaptor.create(LBRACKET588);
-            this.adaptor.addChild(root_0, LBRACKET588_tree);
+            LBRACKET575_tree = this.adaptor.create(LBRACKET575);
+            this.adaptor.addChild(root_0, LBRACKET575_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14010);
-            p_Expr589=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14058);
+            p_Expr576=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr589.getTree());
-            RBRACKET590=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14013); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr576.getTree());
+            RBRACKET577=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14061); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET590_tree = this.adaptor.create(RBRACKET590);
-            this.adaptor.addChild(root_0, RBRACKET590_tree);
+            RBRACKET577_tree = this.adaptor.create(RBRACKET577);
+            this.adaptor.addChild(root_0, RBRACKET577_tree);
             }
 
 
@@ -45816,7 +45861,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1736:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
+    // xquery/XQueryParser.g:1738:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
     // $ANTLR start "p_FTOr"
     p_FTOr: function() {
         var retval = new XQueryParser.p_FTOr_return();
@@ -45825,23 +45870,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_FTAnd591 = null;
-         var p_FTAnd592 = null;
+         var p_FTAnd578 = null;
+         var p_FTAnd579 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1737:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
-            // xquery/XQueryParser.g:1737:11: p_FTAnd (ko= FTOR p_FTAnd )*
+            // xquery/XQueryParser.g:1739:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
+            // xquery/XQueryParser.g:1739:11: p_FTAnd (ko= FTOR p_FTAnd )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14039);
-            p_FTAnd591=this.p_FTAnd();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14087);
+            p_FTAnd578=this.p_FTAnd();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd591.getTree());
-            // xquery/XQueryParser.g:1737:19: (ko= FTOR p_FTAnd )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd578.getTree());
+            // xquery/XQueryParser.g:1739:19: (ko= FTOR p_FTAnd )*
             loop196:
             do {
                 var alt196=2;
@@ -45854,8 +45899,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt196) {
                 case 1 :
-                    // xquery/XQueryParser.g:1737:21: ko= FTOR p_FTAnd
-                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14045); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1739:21: ko= FTOR p_FTAnd
+                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14093); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ko_tree = this.adaptor.create(ko);
                     this.adaptor.addChild(root_0, ko_tree);
@@ -45863,12 +45908,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ko);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14049);
-                    p_FTAnd592=this.p_FTAnd();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14097);
+                    p_FTAnd579=this.p_FTAnd();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd592.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd579.getTree());
 
 
                     break;
@@ -45914,7 +45959,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1741:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
+    // xquery/XQueryParser.g:1743:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
     // $ANTLR start "p_FTAnd"
     p_FTAnd: function() {
         var retval = new XQueryParser.p_FTAnd_return();
@@ -45923,23 +45968,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-         var p_FTMildNot593 = null;
-         var p_FTMildNot594 = null;
+         var p_FTMildNot580 = null;
+         var p_FTMildNot581 = null;
 
         var ka_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1742:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
-            // xquery/XQueryParser.g:1742:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
+            // xquery/XQueryParser.g:1744:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
+            // xquery/XQueryParser.g:1744:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14078);
-            p_FTMildNot593=this.p_FTMildNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14126);
+            p_FTMildNot580=this.p_FTMildNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot593.getTree());
-            // xquery/XQueryParser.g:1742:23: (ka= FTAND p_FTMildNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot580.getTree());
+            // xquery/XQueryParser.g:1744:23: (ka= FTAND p_FTMildNot )*
             loop197:
             do {
                 var alt197=2;
@@ -45952,8 +45997,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt197) {
                 case 1 :
-                    // xquery/XQueryParser.g:1742:25: ka= FTAND p_FTMildNot
-                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1744:25: ka= FTAND p_FTMildNot
+                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14132); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -45961,12 +46006,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14088);
-                    p_FTMildNot594=this.p_FTMildNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14136);
+                    p_FTMildNot581=this.p_FTMildNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot594.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot581.getTree());
 
 
                     break;
@@ -46012,7 +46057,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1746:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
+    // xquery/XQueryParser.g:1748:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
     // $ANTLR start "p_FTMildNot"
     p_FTMildNot: function() {
         var retval = new XQueryParser.p_FTMildNot_return();
@@ -46022,23 +46067,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTUnaryNot595 = null;
-         var p_FTUnaryNot596 = null;
+         var p_FTUnaryNot582 = null;
+         var p_FTUnaryNot583 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1747:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
-            // xquery/XQueryParser.g:1747:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
+            // xquery/XQueryParser.g:1749:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
+            // xquery/XQueryParser.g:1749:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117);
-            p_FTUnaryNot595=this.p_FTUnaryNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165);
+            p_FTUnaryNot582=this.p_FTUnaryNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot595.getTree());
-            // xquery/XQueryParser.g:1747:24: (k+= NOT k+= IN p_FTUnaryNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot582.getTree());
+            // xquery/XQueryParser.g:1749:24: (k+= NOT k+= IN p_FTUnaryNot )*
             loop198:
             do {
                 var alt198=2;
@@ -46051,8 +46096,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt198) {
                 case 1 :
-                    // xquery/XQueryParser.g:1747:26: k+= NOT k+= IN p_FTUnaryNot
-                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14123); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1749:26: k+= NOT k+= IN p_FTUnaryNot
+                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14171); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46060,7 +46105,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14127); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46071,12 +46116,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131);
-                    p_FTUnaryNot596=this.p_FTUnaryNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179);
+                    p_FTUnaryNot583=this.p_FTUnaryNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot596.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot583.getTree());
 
 
                     break;
@@ -46122,7 +46167,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1751:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
+    // xquery/XQueryParser.g:1753:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
     // $ANTLR start "p_FTUnaryNot"
     p_FTUnaryNot: function() {
         var retval = new XQueryParser.p_FTUnaryNot_return();
@@ -46131,16 +46176,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kn = null;
-         var p_FTPrimaryWithOptions597 = null;
+         var p_FTPrimaryWithOptions584 = null;
 
         var kn_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1752:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )? p_FTPrimaryWithOptions
+            // xquery/XQueryParser.g:1754:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )? p_FTPrimaryWithOptions
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )?
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )?
             var alt199=2;
             var LA199_0 = this.input.LA(1);
 
@@ -46149,8 +46194,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt199) {
                 case 1 :
-                    // xquery/XQueryParser.g:1752:13: kn= FTNOT
-                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14164); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1754:13: kn= FTNOT
+                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14212); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kn_tree = this.adaptor.create(kn);
                     this.adaptor.addChild(root_0, kn_tree);
@@ -46164,12 +46209,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171);
-            p_FTPrimaryWithOptions597=this.p_FTPrimaryWithOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219);
+            p_FTPrimaryWithOptions584=this.p_FTPrimaryWithOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions597.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions584.getTree());
 
 
 
@@ -46206,7 +46251,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1756:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
+    // xquery/XQueryParser.g:1758:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
     // $ANTLR start "p_FTPrimaryWithOptions"
     p_FTPrimaryWithOptions: function() {
         var retval = new XQueryParser.p_FTPrimaryWithOptions_return();
@@ -46214,23 +46259,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTPrimary598 = null;
-         var p_FTMatchOptions599 = null;
-         var p_FTWeight600 = null;
+         var p_FTPrimary585 = null;
+         var p_FTMatchOptions586 = null;
+         var p_FTWeight587 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1757:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
-            // xquery/XQueryParser.g:1757:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
+            // xquery/XQueryParser.g:1759:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197);
-            p_FTPrimary598=this.p_FTPrimary();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245);
+            p_FTPrimary585=this.p_FTPrimary();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary598.getTree());
-            // xquery/XQueryParser.g:1757:23: ( p_FTMatchOptions )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary585.getTree());
+            // xquery/XQueryParser.g:1759:23: ( p_FTMatchOptions )?
             var alt200=2;
             var LA200_0 = this.input.LA(1);
 
@@ -46239,20 +46284,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt200) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:23: p_FTMatchOptions
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199);
-                    p_FTMatchOptions599=this.p_FTMatchOptions();
+                    // xquery/XQueryParser.g:1759:23: p_FTMatchOptions
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247);
+                    p_FTMatchOptions586=this.p_FTMatchOptions();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions599.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions586.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1757:41: ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:41: ( p_FTWeight )?
             var alt201=2;
             var LA201_0 = this.input.LA(1);
 
@@ -46261,13 +46306,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt201) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:41: p_FTWeight
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202);
-                    p_FTWeight600=this.p_FTWeight();
+                    // xquery/XQueryParser.g:1759:41: p_FTWeight
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250);
+                    p_FTWeight587=this.p_FTWeight();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight600.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight587.getTree());
 
 
                     break;
@@ -46310,7 +46355,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1764:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
+    // xquery/XQueryParser.g:1766:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
     // $ANTLR start "p_FTPrimary"
     p_FTPrimary: function() {
         var retval = new XQueryParser.p_FTPrimary_return();
@@ -46318,18 +46363,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN603 = null;
-        var RPAREN605 = null;
-         var p_FTWords601 = null;
-         var p_FTTimes602 = null;
-         var p_FTSelection604 = null;
-         var p_FTExtensionSelection606 = null;
+        var LPAREN590 = null;
+        var RPAREN592 = null;
+         var p_FTWords588 = null;
+         var p_FTTimes589 = null;
+         var p_FTSelection591 = null;
+         var p_FTExtensionSelection593 = null;
 
-        var LPAREN603_tree=null;
-        var RPAREN605_tree=null;
+        var LPAREN590_tree=null;
+        var RPAREN592_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1765:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
+            // xquery/XQueryParser.g:1767:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
             var alt203=3;
             switch ( this.input.LA(1) ) {
             case LBRACKET:
@@ -46353,18 +46398,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt203) {
                 case 1 :
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
-                    // xquery/XQueryParser.g:1765:12: p_FTWords ( p_FTTimes )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14233);
-                    p_FTWords601=this.p_FTWords();
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:12: p_FTWords ( p_FTTimes )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14281);
+                    p_FTWords588=this.p_FTWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords601.getTree());
-                    // xquery/XQueryParser.g:1765:22: ( p_FTTimes )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords588.getTree());
+                    // xquery/XQueryParser.g:1767:22: ( p_FTTimes )?
                     var alt202=2;
                     var LA202_0 = this.input.LA(1);
 
@@ -46373,13 +46418,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt202) {
                         case 1 :
-                            // xquery/XQueryParser.g:1765:22: p_FTTimes
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14235);
-                            p_FTTimes602=this.p_FTTimes();
+                            // xquery/XQueryParser.g:1767:22: p_FTTimes
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14283);
+                            p_FTTimes589=this.p_FTTimes();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes602.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes589.getTree());
 
 
                             break;
@@ -46393,26 +46438,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
-                    // xquery/XQueryParser.g:1766:12: LPAREN p_FTSelection RPAREN
-                    LPAREN603=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14250); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:12: LPAREN p_FTSelection RPAREN
+                    LPAREN590=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14298); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN603_tree = this.adaptor.create(LPAREN603);
-                    this.adaptor.addChild(root_0, LPAREN603_tree);
+                    LPAREN590_tree = this.adaptor.create(LPAREN590);
+                    this.adaptor.addChild(root_0, LPAREN590_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14252);
-                    p_FTSelection604=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14300);
+                    p_FTSelection591=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection604.getTree());
-                    RPAREN605=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14254); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection591.getTree());
+                    RPAREN592=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14302); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN605_tree = this.adaptor.create(RPAREN605);
-                    this.adaptor.addChild(root_0, RPAREN605_tree);
+                    RPAREN592_tree = this.adaptor.create(RPAREN592);
+                    this.adaptor.addChild(root_0, RPAREN592_tree);
                     }
 
 
@@ -46421,15 +46466,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1767:11: p_FTExtensionSelection
+                    // xquery/XQueryParser.g:1769:11: p_FTExtensionSelection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267);
-                    p_FTExtensionSelection606=this.p_FTExtensionSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315);
+                    p_FTExtensionSelection593=this.p_FTExtensionSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection606.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection593.getTree());
 
 
                     break;
@@ -46468,7 +46513,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1771:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
+    // xquery/XQueryParser.g:1773:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
     // $ANTLR start "p_FTWords"
     p_FTWords: function() {
         var retval = new XQueryParser.p_FTWords_return();
@@ -46476,22 +46521,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTWordsValue607 = null;
-         var p_FTAnyallOption608 = null;
+         var p_FTWordsValue594 = null;
+         var p_FTAnyallOption595 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1772:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
-            // xquery/XQueryParser.g:1772:11: p_FTWordsValue ( p_FTAnyallOption )?
+            // xquery/XQueryParser.g:1774:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
+            // xquery/XQueryParser.g:1774:11: p_FTWordsValue ( p_FTAnyallOption )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14293);
-            p_FTWordsValue607=this.p_FTWordsValue();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14341);
+            p_FTWordsValue594=this.p_FTWordsValue();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue607.getTree());
-            // xquery/XQueryParser.g:1772:26: ( p_FTAnyallOption )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue594.getTree());
+            // xquery/XQueryParser.g:1774:26: ( p_FTAnyallOption )?
             var alt204=2;
             var LA204_0 = this.input.LA(1);
 
@@ -46500,13 +46545,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt204) {
                 case 1 :
-                    // xquery/XQueryParser.g:1772:26: p_FTAnyallOption
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14295);
-                    p_FTAnyallOption608=this.p_FTAnyallOption();
+                    // xquery/XQueryParser.g:1774:26: p_FTAnyallOption
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14343);
+                    p_FTAnyallOption595=this.p_FTAnyallOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption608.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption595.getTree());
 
 
                     break;
@@ -46549,7 +46594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1776:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
+    // xquery/XQueryParser.g:1778:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
     // $ANTLR start "p_FTWordsValue"
     p_FTWordsValue: function() {
         var retval = new XQueryParser.p_FTWordsValue_return();
@@ -46557,16 +46602,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET610 = null;
-        var RBRACKET612 = null;
-         var p_StringLiteral609 = null;
-         var p_Expr611 = null;
+        var LBRACKET597 = null;
+        var RBRACKET599 = null;
+         var p_StringLiteral596 = null;
+         var p_Expr598 = null;
 
-        var LBRACKET610_tree=null;
-        var RBRACKET612_tree=null;
+        var LBRACKET597_tree=null;
+        var RBRACKET599_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1777:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1779:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt205=2;
             var LA205_0 = this.input.LA(1);
 
@@ -46585,39 +46630,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt205) {
                 case 1 :
-                    // xquery/XQueryParser.g:1777:11: p_StringLiteral
+                    // xquery/XQueryParser.g:1779:11: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14322);
-                    p_StringLiteral609=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14370);
+                    p_StringLiteral596=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral609.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral596.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1778:12: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET610=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14335); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:12: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET597=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14383); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET610_tree = this.adaptor.create(LBRACKET610);
-                    this.adaptor.addChild(root_0, LBRACKET610_tree);
+                    LBRACKET597_tree = this.adaptor.create(LBRACKET597);
+                    this.adaptor.addChild(root_0, LBRACKET597_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14337);
-                    p_Expr611=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14385);
+                    p_Expr598=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr611.getTree());
-                    RBRACKET612=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14340); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr598.getTree());
+                    RBRACKET599=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14388); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET612_tree = this.adaptor.create(RBRACKET612);
-                    this.adaptor.addChild(root_0, RBRACKET612_tree);
+                    RBRACKET599_tree = this.adaptor.create(RBRACKET599);
+                    this.adaptor.addChild(root_0, RBRACKET599_tree);
                     }
 
 
@@ -46660,7 +46705,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1782:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
+    // xquery/XQueryParser.g:1784:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
     // $ANTLR start "p_FTExtensionSelection"
     p_FTExtensionSelection: function() {
         var retval = new XQueryParser.p_FTExtensionSelection_return();
@@ -46668,21 +46713,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma613 = null;
-        var LBRACKET614 = null;
-        var RBRACKET616 = null;
-         var p_FTSelection615 = null;
+        var L_Pragma600 = null;
+        var LBRACKET601 = null;
+        var RBRACKET603 = null;
+         var p_FTSelection602 = null;
 
-        var L_Pragma613_tree=null;
-        var LBRACKET614_tree=null;
-        var RBRACKET616_tree=null;
+        var L_Pragma600_tree=null;
+        var LBRACKET601_tree=null;
+        var RBRACKET603_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1783:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
+            // xquery/XQueryParser.g:1785:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+
             var cnt206=0;
             loop206:
             do {
@@ -46696,11 +46741,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt206) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:11: L_Pragma
-                    L_Pragma613=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1785:11: L_Pragma
+                    L_Pragma600=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma613_tree = this.adaptor.create(L_Pragma613);
-                    this.adaptor.addChild(root_0, L_Pragma613_tree);
+                    L_Pragma600_tree = this.adaptor.create(L_Pragma600);
+                    this.adaptor.addChild(root_0, L_Pragma600_tree);
                     }
 
 
@@ -46717,12 +46762,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt206++;
             } while (true);
 
-            LBRACKET614=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14370); if (this.state.failed) return retval;
+            LBRACKET601=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14418); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET614_tree = this.adaptor.create(LBRACKET614);
-            this.adaptor.addChild(root_0, LBRACKET614_tree);
+            LBRACKET601_tree = this.adaptor.create(LBRACKET601);
+            this.adaptor.addChild(root_0, LBRACKET601_tree);
             }
-            // xquery/XQueryParser.g:1783:30: ( p_FTSelection )?
+            // xquery/XQueryParser.g:1785:30: ( p_FTSelection )?
             var alt207=2;
             var LA207_0 = this.input.LA(1);
 
@@ -46731,23 +46776,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt207) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:30: p_FTSelection
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372);
-                    p_FTSelection615=this.p_FTSelection();
+                    // xquery/XQueryParser.g:1785:30: p_FTSelection
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420);
+                    p_FTSelection602=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection615.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection602.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET616=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14375); if (this.state.failed) return retval;
+            RBRACKET603=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14423); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET616_tree = this.adaptor.create(RBRACKET616);
-            this.adaptor.addChild(root_0, RBRACKET616_tree);
+            RBRACKET603_tree = this.adaptor.create(RBRACKET603);
+            this.adaptor.addChild(root_0, RBRACKET603_tree);
             }
 
 
@@ -46785,7 +46830,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1787:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
+    // xquery/XQueryParser.g:1789:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
     // $ANTLR start "p_FTAnyallOption"
     p_FTAnyallOption: function() {
         var retval = new XQueryParser.p_FTAnyallOption_return();
@@ -46793,19 +46838,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var WORDS617 = null;
+        var WORDS604 = null;
         var k = null;
         var list_k=null;
 
-        var WORDS617_tree=null;
+        var WORDS604_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1788:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             var alt210=3;
             switch ( this.input.LA(1) ) {
             case ANY:
@@ -46827,10 +46872,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt210) {
                 case 1 :
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:14: k+= ANY (k+= WORD )?
-                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14406); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:14: k+= ANY (k+= WORD )?
+                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14454); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46838,7 +46883,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:22: (k+= WORD )?
+                    // xquery/XQueryParser.g:1790:22: (k+= WORD )?
                     var alt208=2;
                     var LA208_0 = this.input.LA(1);
 
@@ -46847,8 +46892,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt208) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:22: k+= WORD
-                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14410); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:22: k+= WORD
+                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14458); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -46869,10 +46914,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:34: k+= ALL ( WORDS )?
-                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14419); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:34: k+= ALL ( WORDS )?
+                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14467); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46880,7 +46925,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:41: ( WORDS )?
+                    // xquery/XQueryParser.g:1790:41: ( WORDS )?
                     var alt209=2;
                     var LA209_0 = this.input.LA(1);
 
@@ -46889,11 +46934,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt209) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:41: WORDS
-                            WORDS617=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14421); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:41: WORDS
+                            WORDS604=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14469); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            WORDS617_tree = this.adaptor.create(WORDS617);
-                            this.adaptor.addChild(root_0, WORDS617_tree);
+                            WORDS604_tree = this.adaptor.create(WORDS604);
+                            this.adaptor.addChild(root_0, WORDS604_tree);
                             }
 
 
@@ -46908,8 +46953,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1788:51: k+= PHRASE
-                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14429); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:51: k+= PHRASE
+                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14477); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46962,7 +47007,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1792:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
+    // xquery/XQueryParser.g:1794:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
     // $ANTLR start "p_FTTimes"
     p_FTTimes: function() {
         var retval = new XQueryParser.p_FTTimes_return();
@@ -46972,16 +47017,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTRange618 = null;
+         var p_FTRange605 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1793:9: (k+= OCCURS p_FTRange k+= TIMES )
-            // xquery/XQueryParser.g:1793:11: k+= OCCURS p_FTRange k+= TIMES
+            // xquery/XQueryParser.g:1795:9: (k+= OCCURS p_FTRange k+= TIMES )
+            // xquery/XQueryParser.g:1795:11: k+= OCCURS p_FTRange k+= TIMES
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14461); if (this.state.failed) return retval;
+            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -46989,13 +47034,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14463);
-            p_FTRange618=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14511);
+            p_FTRange605=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
-            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14467); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange605.getTree());
+            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -47042,7 +47087,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1797:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
+    // xquery/XQueryParser.g:1799:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
     // $ANTLR start "p_FTRange"
     p_FTRange: function() {
         var retval = new XQueryParser.p_FTRange_return();
@@ -47052,20 +47097,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_AdditiveExpr619 = null;
-         var p_AdditiveExpr620 = null;
-         var p_AdditiveExpr621 = null;
-         var p_AdditiveExpr622 = null;
-         var p_AdditiveExpr623 = null;
+         var p_AdditiveExpr606 = null;
+         var p_AdditiveExpr607 = null;
+         var p_AdditiveExpr608 = null;
+         var p_AdditiveExpr609 = null;
+         var p_AdditiveExpr610 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1798:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             var alt211=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -47101,74 +47146,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt211) {
                 case 1 :
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:14: k+= EXACTLY p_AdditiveExpr
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14500); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14502);
-                    p_AdditiveExpr619=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr619.getTree());
-
-
-
-
-
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:14: k+= AT k+= LEAST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14520); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14524); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14526);
-                    p_AdditiveExpr620=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr620.getTree());
-
-
-
-
-
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:14: k+= AT k+= MOST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14544); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:14: k+= EXACTLY p_AdditiveExpr
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47177,11 +47158,75 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     list_k.push(k);
 
                     this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14550);
-                    p_AdditiveExpr621=this.p_AdditiveExpr();
+                    p_AdditiveExpr606=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr621.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr606.getTree());
+
+
+
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:14: k+= AT k+= LEAST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14568); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14572); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14574);
+                    p_AdditiveExpr607=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr607.getTree());
+
+
+
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:14: k+= AT k+= MOST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14592); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14596); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14598);
+                    p_AdditiveExpr608=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr608.getTree());
 
 
 
@@ -47189,10 +47234,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14568); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14616); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47200,13 +47245,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14570);
-                    p_AdditiveExpr622=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14618);
+                    p_AdditiveExpr609=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr622.getTree());
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14574); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr609.getTree());
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14622); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47214,12 +47259,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14576);
-                    p_AdditiveExpr623=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14624);
+                    p_AdditiveExpr610=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr623.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr610.getTree());
 
 
 
@@ -47268,7 +47313,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1805:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
+    // xquery/XQueryParser.g:1807:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
     // $ANTLR start "p_FTPosFilter"
     p_FTPosFilter: function() {
         var retval = new XQueryParser.p_FTPosFilter_return();
@@ -47276,15 +47321,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOrder624 = null;
-         var p_FTWindow625 = null;
-         var p_FTDistance626 = null;
-         var p_FTScope627 = null;
-         var p_FTContent628 = null;
+         var p_FTOrder611 = null;
+         var p_FTWindow612 = null;
+         var p_FTDistance613 = null;
+         var p_FTScope614 = null;
+         var p_FTContent615 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1806:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
+            // xquery/XQueryParser.g:1808:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
             var alt212=5;
             switch ( this.input.LA(1) ) {
             case ORDERED:
@@ -47314,67 +47359,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt212) {
                 case 1 :
-                    // xquery/XQueryParser.g:1806:11: p_FTOrder
+                    // xquery/XQueryParser.g:1808:11: p_FTOrder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14607);
-                    p_FTOrder624=this.p_FTOrder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14655);
+                    p_FTOrder611=this.p_FTOrder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder624.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder611.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1806:23: p_FTWindow
+                    // xquery/XQueryParser.g:1808:23: p_FTWindow
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14611);
-                    p_FTWindow625=this.p_FTWindow();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14659);
+                    p_FTWindow612=this.p_FTWindow();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow625.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow612.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1806:36: p_FTDistance
+                    // xquery/XQueryParser.g:1808:36: p_FTDistance
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14615);
-                    p_FTDistance626=this.p_FTDistance();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14663);
+                    p_FTDistance613=this.p_FTDistance();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance626.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance613.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1806:51: p_FTScope
+                    // xquery/XQueryParser.g:1808:51: p_FTScope
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14619);
-                    p_FTScope627=this.p_FTScope();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14667);
+                    p_FTScope614=this.p_FTScope();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope627.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope614.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1806:63: p_FTContent
+                    // xquery/XQueryParser.g:1808:63: p_FTContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14623);
-                    p_FTContent628=this.p_FTContent();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14671);
+                    p_FTContent615=this.p_FTContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent628.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent615.getTree());
 
 
                     break;
@@ -47413,7 +47458,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1810:1: p_FTOrder : ko= ORDERED ;
+    // xquery/XQueryParser.g:1812:1: p_FTOrder : ko= ORDERED ;
     // $ANTLR start "p_FTOrder"
     p_FTOrder: function() {
         var retval = new XQueryParser.p_FTOrder_return();
@@ -47426,11 +47471,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1811:9: (ko= ORDERED )
-            // xquery/XQueryParser.g:1811:11: ko= ORDERED
+            // xquery/XQueryParser.g:1813:9: (ko= ORDERED )
+            // xquery/XQueryParser.g:1813:11: ko= ORDERED
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14651); if (this.state.failed) return retval;
+            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14699); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -47474,7 +47519,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1815:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
+    // xquery/XQueryParser.g:1817:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
     // $ANTLR start "p_FTWindow"
     p_FTWindow: function() {
         var retval = new XQueryParser.p_FTWindow_return();
@@ -47483,17 +47528,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-         var p_AdditiveExpr629 = null;
-         var p_FTUnit630 = null;
+         var p_AdditiveExpr616 = null;
+         var p_FTUnit617 = null;
 
         var kw_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1816:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
-            // xquery/XQueryParser.g:1816:11: kw= WINDOW p_AdditiveExpr p_FTUnit
+            // xquery/XQueryParser.g:1818:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
+            // xquery/XQueryParser.g:1818:11: kw= WINDOW p_AdditiveExpr p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14681); if (this.state.failed) return retval;
+            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14729); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -47501,18 +47546,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14685);
-            p_AdditiveExpr629=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14733);
+            p_AdditiveExpr616=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr629.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14687);
-            p_FTUnit630=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr616.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14735);
+            p_FTUnit617=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit630.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit617.getTree());
 
 
 
@@ -47549,7 +47594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1820:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
+    // xquery/XQueryParser.g:1822:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
     // $ANTLR start "p_FTDistance"
     p_FTDistance: function() {
         var retval = new XQueryParser.p_FTDistance_return();
@@ -47558,17 +47603,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kd = null;
-         var p_FTRange631 = null;
-         var p_FTUnit632 = null;
+         var p_FTRange618 = null;
+         var p_FTUnit619 = null;
 
         var kd_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1821:9: (kd= DISTANCE p_FTRange p_FTUnit )
-            // xquery/XQueryParser.g:1821:11: kd= DISTANCE p_FTRange p_FTUnit
+            // xquery/XQueryParser.g:1823:9: (kd= DISTANCE p_FTRange p_FTUnit )
+            // xquery/XQueryParser.g:1823:11: kd= DISTANCE p_FTRange p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14715); if (this.state.failed) return retval;
+            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kd_tree = this.adaptor.create(kd);
             this.adaptor.addChild(root_0, kd_tree);
@@ -47576,18 +47621,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kd);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14719);
-            p_FTRange631=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14767);
+            p_FTRange618=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange631.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14721);
-            p_FTUnit632=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14769);
+            p_FTUnit619=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit632.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit619.getTree());
 
 
 
@@ -47624,7 +47669,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1825:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
+    // xquery/XQueryParser.g:1827:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
     // $ANTLR start "p_FTUnit"
     p_FTUnit: function() {
         var retval = new XQueryParser.p_FTUnit_return();
@@ -47638,11 +47683,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1826:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             var alt213=3;
             switch ( this.input.LA(1) ) {
             case WORDS:
@@ -47664,8 +47709,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt213) {
                 case 1 :
-                    // xquery/XQueryParser.g:1826:13: k+= WORDS
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14751); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:13: k+= WORDS
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14799); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47677,8 +47722,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1826:24: k+= SENTENCES
-                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14757); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:24: k+= SENTENCES
+                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14805); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47690,8 +47735,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1826:39: k+= PARAGRAPHS
-                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14763); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:39: k+= PARAGRAPHS
+                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14811); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47744,7 +47789,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1830:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
+    // xquery/XQueryParser.g:1832:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
     // $ANTLR start "p_FTScope"
     p_FTScope: function() {
         var retval = new XQueryParser.p_FTScope_return();
@@ -47754,16 +47799,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTBigUnit633 = null;
+         var p_FTBigUnit620 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1831:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
+            // xquery/XQueryParser.g:1833:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT )
             var alt214=2;
             var LA214_0 = this.input.LA(1);
 
@@ -47782,8 +47827,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt214) {
                 case 1 :
-                    // xquery/XQueryParser.g:1831:12: k+= SAME
-                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14796); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:12: k+= SAME
+                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14844); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47795,8 +47840,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1831:22: k+= DIFFERENT
-                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14802); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:22: k+= DIFFERENT
+                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14850); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47813,12 +47858,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14807);
-            p_FTBigUnit633=this.p_FTBigUnit();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14855);
+            p_FTBigUnit620=this.p_FTBigUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit633.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit620.getTree());
 
 
 
@@ -47855,7 +47900,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1835:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
+    // xquery/XQueryParser.g:1837:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
     // $ANTLR start "p_FTBigUnit"
     p_FTBigUnit: function() {
         var retval = new XQueryParser.p_FTBigUnit_return();
@@ -47869,11 +47914,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1836:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             var alt215=2;
             var LA215_0 = this.input.LA(1);
 
@@ -47892,8 +47937,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt215) {
                 case 1 :
-                    // xquery/XQueryParser.g:1836:13: k+= SENTENCE
-                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14837); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:13: k+= SENTENCE
+                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14885); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47905,8 +47950,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1836:27: k+= PARAGRAPH
-                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14843); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:27: k+= PARAGRAPH
+                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14891); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47959,7 +48004,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1840:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
+    // xquery/XQueryParser.g:1842:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
     // $ANTLR start "p_FTContent"
     p_FTContent: function() {
         var retval = new XQueryParser.p_FTContent_return();
@@ -47973,11 +48018,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1841:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             var alt216=3;
             var LA216_0 = this.input.LA(1);
 
@@ -48010,10 +48055,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt216) {
                 case 1 :
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:14: k+= AT k+= START
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14878); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:14: k+= AT k+= START
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14926); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48021,7 +48066,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14882); if (this.state.failed) return retval;
+                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48036,10 +48081,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:33: k+= AT k+= END
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14890); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:33: k+= AT k+= END
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14938); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48047,7 +48092,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14894); if (this.state.failed) return retval;
+                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14942); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48062,10 +48107,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:50: k+= ENTIRE k+= CONTENT
-                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14902); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:50: k+= ENTIRE k+= CONTENT
+                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14950); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48073,7 +48118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14906); if (this.state.failed) return retval;
+                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14954); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48129,7 +48174,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1845:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
+    // xquery/XQueryParser.g:1847:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
     // $ANTLR start "p_FTMatchOptions"
     p_FTMatchOptions: function() {
         var retval = new XQueryParser.p_FTMatchOptions_return();
@@ -48138,16 +48183,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ku = null;
-         var p_FTMatchOption634 = null;
+         var p_FTMatchOption621 = null;
 
         var ku_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1846:9: ( (ku= USING p_FTMatchOption )+ )
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:9: ( (ku= USING p_FTMatchOption )+ )
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             var cnt217=0;
             loop217:
             do {
@@ -48161,8 +48206,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt217) {
                 case 1 :
-                    // xquery/XQueryParser.g:1846:12: ku= USING p_FTMatchOption
-                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14940); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1848:12: ku= USING p_FTMatchOption
+                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14988); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ku_tree = this.adaptor.create(ku);
                     this.adaptor.addChild(root_0, ku_tree);
@@ -48170,12 +48215,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ku);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944);
-                    p_FTMatchOption634=this.p_FTMatchOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992);
+                    p_FTMatchOption621=this.p_FTMatchOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption634.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption621.getTree());
 
 
                     break;
@@ -48227,7 +48272,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
+    // xquery/XQueryParser.g:1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
     // $ANTLR start "p_FTMatchOption"
     p_FTMatchOption: function() {
         var retval = new XQueryParser.p_FTMatchOption_return();
@@ -48235,122 +48280,122 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTLanguageOption635 = null;
-         var p_FTWildCardOption636 = null;
-         var p_FTThesaurusOption637 = null;
-         var p_FTStemOption638 = null;
-         var p_FTCaseOption639 = null;
-         var p_FTDiacriticsOption640 = null;
-         var p_FTStopWordOption641 = null;
-         var p_FTExtensionOption642 = null;
+         var p_FTLanguageOption622 = null;
+         var p_FTWildCardOption623 = null;
+         var p_FTThesaurusOption624 = null;
+         var p_FTStemOption625 = null;
+         var p_FTCaseOption626 = null;
+         var p_FTDiacriticsOption627 = null;
+         var p_FTStopWordOption628 = null;
+         var p_FTExtensionOption629 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1851:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
+            // xquery/XQueryParser.g:1853:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
             var alt218=8;
             alt218 = this.dfa218.predict(this.input);
             switch (alt218) {
                 case 1 :
-                    // xquery/XQueryParser.g:1851:11: p_FTLanguageOption
+                    // xquery/XQueryParser.g:1853:11: p_FTLanguageOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972);
-                    p_FTLanguageOption635=this.p_FTLanguageOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020);
+                    p_FTLanguageOption622=this.p_FTLanguageOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption635.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption622.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1852:11: p_FTWildCardOption
+                    // xquery/XQueryParser.g:1854:11: p_FTWildCardOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984);
-                    p_FTWildCardOption636=this.p_FTWildCardOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032);
+                    p_FTWildCardOption623=this.p_FTWildCardOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption636.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption623.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1853:11: p_FTThesaurusOption
+                    // xquery/XQueryParser.g:1855:11: p_FTThesaurusOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996);
-                    p_FTThesaurusOption637=this.p_FTThesaurusOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044);
+                    p_FTThesaurusOption624=this.p_FTThesaurusOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption637.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption624.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1854:11: p_FTStemOption
+                    // xquery/XQueryParser.g:1856:11: p_FTStemOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15008);
-                    p_FTStemOption638=this.p_FTStemOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15056);
+                    p_FTStemOption625=this.p_FTStemOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption638.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption625.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1855:11: p_FTCaseOption
+                    // xquery/XQueryParser.g:1857:11: p_FTCaseOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020);
-                    p_FTCaseOption639=this.p_FTCaseOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068);
+                    p_FTCaseOption626=this.p_FTCaseOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption639.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption626.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1856:11: p_FTDiacriticsOption
+                    // xquery/XQueryParser.g:1858:11: p_FTDiacriticsOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032);
-                    p_FTDiacriticsOption640=this.p_FTDiacriticsOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080);
+                    p_FTDiacriticsOption627=this.p_FTDiacriticsOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption640.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption627.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1857:11: p_FTStopWordOption
+                    // xquery/XQueryParser.g:1859:11: p_FTStopWordOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044);
-                    p_FTStopWordOption641=this.p_FTStopWordOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092);
+                    p_FTStopWordOption628=this.p_FTStopWordOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption641.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption628.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1858:11: p_FTExtensionOption
+                    // xquery/XQueryParser.g:1860:11: p_FTExtensionOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056);
-                    p_FTExtensionOption642=this.p_FTExtensionOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104);
+                    p_FTExtensionOption629=this.p_FTExtensionOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption642.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption629.getTree());
 
 
                     break;
@@ -48389,7 +48434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1862:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
+    // xquery/XQueryParser.g:1864:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
     // $ANTLR start "p_FTCaseOption"
     p_FTCaseOption: function() {
         var retval = new XQueryParser.p_FTCaseOption_return();
@@ -48403,11 +48448,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1863:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             var alt219=4;
             switch ( this.input.LA(1) ) {
             case CASE:
@@ -48443,10 +48488,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt219) {
                 case 1 :
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:14: k+= CASE k+= INSENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15087); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:14: k+= CASE k+= INSENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15135); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48454,7 +48499,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15091); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15139); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48469,10 +48514,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:14: k+= CASE k+= SENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15109); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:14: k+= CASE k+= SENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15157); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48480,7 +48525,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15113); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48495,8 +48540,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1865:13: k+= LOWERCASE
-                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15130); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1867:13: k+= LOWERCASE
+                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15178); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48508,8 +48553,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1866:13: k+= UPPERCASE
-                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15146); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1868:13: k+= UPPERCASE
+                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15194); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48562,7 +48607,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1870:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
+    // xquery/XQueryParser.g:1872:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
     // $ANTLR start "p_FTDiacriticsOption"
     p_FTDiacriticsOption: function() {
         var retval = new XQueryParser.p_FTDiacriticsOption_return();
@@ -48576,11 +48621,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1871:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             var alt220=2;
             var LA220_0 = this.input.LA(1);
 
@@ -48610,10 +48655,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt220) {
                 case 1 :
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:14: k+= DIACRITICS k+= INSENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:14: k+= DIACRITICS k+= INSENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48621,7 +48666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48636,10 +48681,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:14: k+= DIACRITICS k+= SENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:14: k+= DIACRITICS k+= SENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48647,7 +48692,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48703,7 +48748,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1876:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
+    // xquery/XQueryParser.g:1878:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
     // $ANTLR start "p_FTStemOption"
     p_FTStemOption: function() {
         var retval = new XQueryParser.p_FTStemOption_return();
@@ -48717,11 +48762,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1877:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             var alt221=2;
             var LA221_0 = this.input.LA(1);
 
@@ -48740,8 +48785,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt221) {
                 case 1 :
-                    // xquery/XQueryParser.g:1877:13: k+= STEMMING
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15242); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:13: k+= STEMMING
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48753,10 +48798,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:28: k+= NO k+= STEMMING
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15249); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:28: k+= NO k+= STEMMING
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15297); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48764,7 +48809,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15253); if (this.state.failed) return retval;
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15301); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48820,7 +48865,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1881:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
+    // xquery/XQueryParser.g:1883:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
     // $ANTLR start "p_FTThesaurusOption"
     p_FTThesaurusOption: function() {
         var retval = new XQueryParser.p_FTThesaurusOption_return();
@@ -48828,26 +48873,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN644 = null;
-        var COMMA646 = null;
-        var RPAREN648 = null;
+        var LPAREN631 = null;
+        var COMMA633 = null;
+        var RPAREN635 = null;
         var k = null;
         var list_k=null;
-         var p_FTThesaurusID643 = null;
-         var p_FTThesaurusID645 = null;
-         var p_FTThesaurusID647 = null;
+         var p_FTThesaurusID630 = null;
+         var p_FTThesaurusID632 = null;
+         var p_FTThesaurusID634 = null;
 
-        var LPAREN644_tree=null;
-        var COMMA646_tree=null;
-        var RPAREN648_tree=null;
+        var LPAREN631_tree=null;
+        var COMMA633_tree=null;
+        var RPAREN635_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1882:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             var alt225=3;
             var LA225_0 = this.input.LA(1);
 
@@ -48880,10 +48925,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt225) {
                 case 1 :
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15289); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15337); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48891,7 +48936,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1882:27: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1884:27: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt222=2;
                     var LA222_0 = this.input.LA(1);
 
@@ -48910,19 +48955,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt222) {
                         case 1 :
-                            // xquery/XQueryParser.g:1882:28: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292);
-                            p_FTThesaurusID643=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1884:28: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340);
+                            p_FTThesaurusID630=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID643.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID630.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1882:46: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15298); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1884:46: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15346); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -48943,10 +48988,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15317); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15365); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48954,12 +48999,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    LPAREN644=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15319); if (this.state.failed) return retval;
+                    LPAREN631=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15367); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN644_tree = this.adaptor.create(LPAREN644);
-                    this.adaptor.addChild(root_0, LPAREN644_tree);
+                    LPAREN631_tree = this.adaptor.create(LPAREN631);
+                    this.adaptor.addChild(root_0, LPAREN631_tree);
                     }
-                    // xquery/XQueryParser.g:1883:34: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1885:34: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt223=2;
                     var LA223_0 = this.input.LA(1);
 
@@ -48978,19 +49023,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt223) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:35: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322);
-                            p_FTThesaurusID645=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1885:35: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370);
+                            p_FTThesaurusID632=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID645.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID632.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1883:53: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15328); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:53: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15376); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -49004,7 +49049,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    // xquery/XQueryParser.g:1883:65: ( COMMA p_FTThesaurusID )*
+                    // xquery/XQueryParser.g:1885:65: ( COMMA p_FTThesaurusID )*
                     loop224:
                     do {
                         var alt224=2;
@@ -49017,18 +49062,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt224) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:66: COMMA p_FTThesaurusID
-                            COMMA646=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15332); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:66: COMMA p_FTThesaurusID
+                            COMMA633=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15380); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA646_tree = this.adaptor.create(COMMA646);
-                            this.adaptor.addChild(root_0, COMMA646_tree);
+                            COMMA633_tree = this.adaptor.create(COMMA633);
+                            this.adaptor.addChild(root_0, COMMA633_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334);
-                            p_FTThesaurusID647=this.p_FTThesaurusID();
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382);
+                            p_FTThesaurusID634=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID647.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID634.getTree());
 
 
                             break;
@@ -49038,10 +49083,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN648=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15338); if (this.state.failed) return retval;
+                    RPAREN635=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15386); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN648_tree = this.adaptor.create(RPAREN648);
-                    this.adaptor.addChild(root_0, RPAREN648_tree);
+                    RPAREN635_tree = this.adaptor.create(RPAREN635);
+                    this.adaptor.addChild(root_0, RPAREN635_tree);
                     }
 
 
@@ -49050,10 +49095,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:14: k+= NO k+= THESAURUS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15356); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:14: k+= NO k+= THESAURUS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15404); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49061,7 +49106,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15360); if (this.state.failed) return retval;
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15408); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49117,7 +49162,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1888:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
+    // xquery/XQueryParser.g:1890:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
     // $ANTLR start "p_FTThesaurusID"
     p_FTThesaurusID: function() {
         var retval = new XQueryParser.p_FTThesaurusID_return();
@@ -49127,18 +49172,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral649 = null;
-         var p_StringLiteral650 = null;
-         var p_FTLiteralRange651 = null;
+         var p_StringLiteral636 = null;
+         var p_StringLiteral637 = null;
+         var p_FTLiteralRange638 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1889:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
-            // xquery/XQueryParser.g:1889:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
+            // xquery/XQueryParser.g:1891:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15393); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15441); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -49146,13 +49191,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395);
-            p_StringLiteral649=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443);
+            p_StringLiteral636=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral649.getTree());
-            // xquery/XQueryParser.g:1889:33: (k+= RELATIONSHIP p_StringLiteral )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral636.getTree());
+            // xquery/XQueryParser.g:1891:33: (k+= RELATIONSHIP p_StringLiteral )?
             var alt226=2;
             var LA226_0 = this.input.LA(1);
 
@@ -49161,8 +49206,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt226) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:34: k+= RELATIONSHIP p_StringLiteral
-                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1891:34: k+= RELATIONSHIP p_StringLiteral
+                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49170,19 +49215,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402);
-                    p_StringLiteral650=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450);
+                    p_StringLiteral637=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral637.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1889:68: ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:68: ( p_FTLiteralRange k+= LEVELS )?
             var alt227=2;
             var LA227_0 = this.input.LA(1);
 
@@ -49198,14 +49243,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt227) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:69: p_FTLiteralRange k+= LEVELS
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407);
-                    p_FTLiteralRange651=this.p_FTLiteralRange();
+                    // xquery/XQueryParser.g:1891:69: p_FTLiteralRange k+= LEVELS
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455);
+                    p_FTLiteralRange638=this.p_FTLiteralRange();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange651.getTree());
-                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15411); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange638.getTree());
+                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15459); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49258,7 +49303,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1893:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
+    // xquery/XQueryParser.g:1895:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
     // $ANTLR start "p_FTLiteralRange"
     p_FTLiteralRange: function() {
         var retval = new XQueryParser.p_FTLiteralRange_return();
@@ -49266,29 +49311,29 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_IntegerLiteral652 = null;
-        var L_IntegerLiteral653 = null;
-        var L_IntegerLiteral654 = null;
-        var L_IntegerLiteral655 = null;
-        var TO656 = null;
-        var L_IntegerLiteral657 = null;
+        var L_IntegerLiteral639 = null;
+        var L_IntegerLiteral640 = null;
+        var L_IntegerLiteral641 = null;
+        var L_IntegerLiteral642 = null;
+        var TO643 = null;
+        var L_IntegerLiteral644 = null;
         var k = null;
         var list_k=null;
 
-        var L_IntegerLiteral652_tree=null;
-        var L_IntegerLiteral653_tree=null;
-        var L_IntegerLiteral654_tree=null;
-        var L_IntegerLiteral655_tree=null;
-        var TO656_tree=null;
-        var L_IntegerLiteral657_tree=null;
+        var L_IntegerLiteral639_tree=null;
+        var L_IntegerLiteral640_tree=null;
+        var L_IntegerLiteral641_tree=null;
+        var L_IntegerLiteral642_tree=null;
+        var TO643_tree=null;
+        var L_IntegerLiteral644_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1894:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             var alt228=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -49324,10 +49369,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt228) {
                 case 1 :
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:14: k+= EXACTLY L_IntegerLiteral
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15446); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:14: k+= EXACTLY L_IntegerLiteral
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49335,10 +49380,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral652=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448); if (this.state.failed) return retval;
+                    L_IntegerLiteral639=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral652_tree = this.adaptor.create(L_IntegerLiteral652);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral652_tree);
+                    L_IntegerLiteral639_tree = this.adaptor.create(L_IntegerLiteral639);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral639_tree);
                     }
 
 
@@ -49347,10 +49392,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:14: k+= AT k+= LEAST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15466); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:14: k+= AT k+= LEAST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49358,7 +49403,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15470); if (this.state.failed) return retval;
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49366,10 +49411,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral653=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472); if (this.state.failed) return retval;
+                    L_IntegerLiteral640=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral653_tree = this.adaptor.create(L_IntegerLiteral653);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral653_tree);
+                    L_IntegerLiteral640_tree = this.adaptor.create(L_IntegerLiteral640);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral640_tree);
                     }
 
 
@@ -49378,10 +49423,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:14: k+= AT k+= MOST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15490); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:14: k+= AT k+= MOST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15538); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49389,7 +49434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15542); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49397,10 +49442,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral654=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
+                    L_IntegerLiteral641=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral654_tree = this.adaptor.create(L_IntegerLiteral654);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral654_tree);
+                    L_IntegerLiteral641_tree = this.adaptor.create(L_IntegerLiteral641);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral641_tree);
                     }
 
 
@@ -49409,10 +49454,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15562); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49420,20 +49465,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral655=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516); if (this.state.failed) return retval;
+                    L_IntegerLiteral642=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral655_tree = this.adaptor.create(L_IntegerLiteral655);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral655_tree);
+                    L_IntegerLiteral642_tree = this.adaptor.create(L_IntegerLiteral642);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral642_tree);
                     }
-                    TO656=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
+                    TO643=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15566); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    TO656_tree = this.adaptor.create(TO656);
-                    this.adaptor.addChild(root_0, TO656_tree);
+                    TO643_tree = this.adaptor.create(TO643);
+                    this.adaptor.addChild(root_0, TO643_tree);
                     }
-                    L_IntegerLiteral657=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
+                    L_IntegerLiteral644=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral657_tree = this.adaptor.create(L_IntegerLiteral657);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral657_tree);
+                    L_IntegerLiteral644_tree = this.adaptor.create(L_IntegerLiteral644);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral644_tree);
                     }
 
 
@@ -49483,7 +49528,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1901:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
+    // xquery/XQueryParser.g:1903:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
     // $ANTLR start "p_FTStopWordOption"
     p_FTStopWordOption: function() {
         var retval = new XQueryParser.p_FTStopWordOption_return();
@@ -49493,18 +49538,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords658 = null;
-         var p_FTStopWordsInclExcl659 = null;
-         var p_FTStopWordsInclExcl660 = null;
+         var p_FTStopWords645 = null;
+         var p_FTStopWordsInclExcl646 = null;
+         var p_FTStopWordsInclExcl647 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1902:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             var alt231=3;
             var LA231_0 = this.input.LA(1);
 
@@ -49548,10 +49593,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt231) {
                 case 1 :
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15556); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15604); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49559,7 +49604,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15560); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15608); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49567,13 +49612,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562);
-                    p_FTStopWords658=this.p_FTStopWords();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610);
+                    p_FTStopWords645=this.p_FTStopWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords658.getTree());
-                    // xquery/XQueryParser.g:1902:45: ( p_FTStopWordsInclExcl )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords645.getTree());
+                    // xquery/XQueryParser.g:1904:45: ( p_FTStopWordsInclExcl )*
                     loop229:
                     do {
                         var alt229=2;
@@ -49586,13 +49631,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt229) {
                         case 1 :
-                            // xquery/XQueryParser.g:1902:45: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564);
-                            p_FTStopWordsInclExcl659=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1904:45: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612);
+                            p_FTStopWordsInclExcl646=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl659.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl646.getTree());
 
 
                             break;
@@ -49609,10 +49654,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15583); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15631); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49620,7 +49665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15587); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15635); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49628,7 +49673,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15591); if (this.state.failed) return retval;
+                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15639); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49636,7 +49681,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1903:42: ( p_FTStopWordsInclExcl )*
+                    // xquery/XQueryParser.g:1905:42: ( p_FTStopWordsInclExcl )*
                     loop230:
                     do {
                         var alt230=2;
@@ -49649,13 +49694,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt230) {
                         case 1 :
-                            // xquery/XQueryParser.g:1903:42: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593);
-                            p_FTStopWordsInclExcl660=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1905:42: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641);
+                            p_FTStopWordsInclExcl647=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl660.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl647.getTree());
 
 
                             break;
@@ -49672,10 +49717,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:14: k+= NO k+= STOP k+= WORDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15612); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:14: k+= NO k+= STOP k+= WORDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15660); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49683,7 +49728,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15616); if (this.state.failed) return retval;
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15664); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49691,7 +49736,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15620); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15668); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49747,7 +49792,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1908:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
+    // xquery/XQueryParser.g:1910:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
     // $ANTLR start "p_FTStopWords"
     p_FTStopWords: function() {
         var retval = new XQueryParser.p_FTStopWords_return();
@@ -49756,20 +49801,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-        var LPAREN662 = null;
-        var COMMA664 = null;
-        var RPAREN666 = null;
-         var p_StringLiteral661 = null;
-         var p_StringLiteral663 = null;
-         var p_StringLiteral665 = null;
+        var LPAREN649 = null;
+        var COMMA651 = null;
+        var RPAREN653 = null;
+         var p_StringLiteral648 = null;
+         var p_StringLiteral650 = null;
+         var p_StringLiteral652 = null;
 
         var ka_tree=null;
-        var LPAREN662_tree=null;
-        var COMMA664_tree=null;
-        var RPAREN666_tree=null;
+        var LPAREN649_tree=null;
+        var COMMA651_tree=null;
+        var RPAREN653_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1909:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
+            // xquery/XQueryParser.g:1911:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
             var alt233=2;
             var LA233_0 = this.input.LA(1);
 
@@ -49788,12 +49833,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt233) {
                 case 1 :
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
-                    // xquery/XQueryParser.g:1909:12: ka= AT p_StringLiteral
-                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15654); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:12: ka= AT p_StringLiteral
+                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15702); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -49801,12 +49846,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15658);
-                    p_StringLiteral661=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15706);
+                    p_StringLiteral648=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral661.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral648.getTree());
 
 
 
@@ -49814,23 +49859,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
-                    // xquery/XQueryParser.g:1910:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
-                    LPAREN662=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15672); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
+                    LPAREN649=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN662_tree = this.adaptor.create(LPAREN662);
-                    this.adaptor.addChild(root_0, LPAREN662_tree);
+                    LPAREN649_tree = this.adaptor.create(LPAREN649);
+                    this.adaptor.addChild(root_0, LPAREN649_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15674);
-                    p_StringLiteral663=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15722);
+                    p_StringLiteral650=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral663.getTree());
-                    // xquery/XQueryParser.g:1910:35: ( COMMA p_StringLiteral )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    // xquery/XQueryParser.g:1912:35: ( COMMA p_StringLiteral )*
                     loop232:
                     do {
                         var alt232=2;
@@ -49843,18 +49888,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt232) {
                         case 1 :
-                            // xquery/XQueryParser.g:1910:36: COMMA p_StringLiteral
-                            COMMA664=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15677); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1912:36: COMMA p_StringLiteral
+                            COMMA651=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15725); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA664_tree = this.adaptor.create(COMMA664);
-                            this.adaptor.addChild(root_0, COMMA664_tree);
+                            COMMA651_tree = this.adaptor.create(COMMA651);
+                            this.adaptor.addChild(root_0, COMMA651_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15679);
-                            p_StringLiteral665=this.p_StringLiteral();
+                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15727);
+                            p_StringLiteral652=this.p_StringLiteral();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral665.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral652.getTree());
 
 
                             break;
@@ -49864,10 +49909,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN666=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15683); if (this.state.failed) return retval;
+                    RPAREN653=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15731); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN666_tree = this.adaptor.create(RPAREN666);
-                    this.adaptor.addChild(root_0, RPAREN666_tree);
+                    RPAREN653_tree = this.adaptor.create(RPAREN653);
+                    this.adaptor.addChild(root_0, RPAREN653_tree);
                     }
 
 
@@ -49910,7 +49955,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1914:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
+    // xquery/XQueryParser.g:1916:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
     // $ANTLR start "p_FTStopWordsInclExcl"
     p_FTStopWordsInclExcl: function() {
         var retval = new XQueryParser.p_FTStopWordsInclExcl_return();
@@ -49920,18 +49965,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords667 = null;
+         var p_FTStopWords654 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1915:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT )
             var alt234=2;
             var LA234_0 = this.input.LA(1);
 
@@ -49950,8 +49995,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt234) {
                 case 1 :
-                    // xquery/XQueryParser.g:1915:14: k+= UNION
-                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15715); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:14: k+= UNION
+                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15763); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49963,8 +50008,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1915:25: k+= EXCEPT
-                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:25: k+= EXCEPT
+                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49978,12 +50023,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724);
-            p_FTStopWords667=this.p_FTStopWords();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772);
+            p_FTStopWords654=this.p_FTStopWords();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords667.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords654.getTree());
 
 
 
@@ -50026,7 +50071,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1919:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
+    // xquery/XQueryParser.g:1921:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
     // $ANTLR start "p_FTLanguageOption"
     p_FTLanguageOption: function() {
         var retval = new XQueryParser.p_FTLanguageOption_return();
@@ -50035,16 +50080,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kl = null;
-         var p_StringLiteral668 = null;
+         var p_StringLiteral655 = null;
 
         var kl_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1920:9: (kl= LANGUAGE p_StringLiteral )
-            // xquery/XQueryParser.g:1920:11: kl= LANGUAGE p_StringLiteral
+            // xquery/XQueryParser.g:1922:9: (kl= LANGUAGE p_StringLiteral )
+            // xquery/XQueryParser.g:1922:11: kl= LANGUAGE p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15756); if (this.state.failed) return retval;
+            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15804); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kl_tree = this.adaptor.create(kl);
             this.adaptor.addChild(root_0, kl_tree);
@@ -50052,12 +50097,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kl);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760);
-            p_StringLiteral668=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808);
+            p_StringLiteral655=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral668.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral655.getTree());
 
 
 
@@ -50094,7 +50139,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1924:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
+    // xquery/XQueryParser.g:1926:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
     // $ANTLR start "p_FTWildCardOption"
     p_FTWildCardOption: function() {
         var retval = new XQueryParser.p_FTWildCardOption_return();
@@ -50108,11 +50153,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1925:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             var alt235=2;
             var LA235_0 = this.input.LA(1);
 
@@ -50131,8 +50176,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt235) {
                 case 1 :
-                    // xquery/XQueryParser.g:1925:13: k+= WILDCARDS
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15790); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:13: k+= WILDCARDS
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15838); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50144,10 +50189,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:29: k+= NO k+= WILDCARDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15797); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:29: k+= NO k+= WILDCARDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15845); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50155,7 +50200,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15801); if (this.state.failed) return retval;
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15849); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50211,7 +50256,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1929:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
+    // xquery/XQueryParser.g:1931:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
     // $ANTLR start "p_FTExtensionOption"
     p_FTExtensionOption: function() {
         var retval = new XQueryParser.p_FTExtensionOption_return();
@@ -50220,17 +50265,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_QName669 = null;
-         var p_StringLiteral670 = null;
+         var p_QName656 = null;
+         var p_StringLiteral657 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1930:9: (ko= OPTION p_QName p_StringLiteral )
-            // xquery/XQueryParser.g:1930:11: ko= OPTION p_QName p_StringLiteral
+            // xquery/XQueryParser.g:1932:9: (ko= OPTION p_QName p_StringLiteral )
+            // xquery/XQueryParser.g:1932:11: ko= OPTION p_QName p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15834); if (this.state.failed) return retval;
+            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15882); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -50238,18 +50283,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ko);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15838);
-            p_QName669=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15886);
+            p_QName656=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName669.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840);
-            p_StringLiteral670=this.p_StringLiteral();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName656.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888);
+            p_StringLiteral657=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral670.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral657.getTree());
 
 
 
@@ -50286,7 +50331,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1934:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
+    // xquery/XQueryParser.g:1936:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
     // $ANTLR start "p_FTIgnoreOption"
     p_FTIgnoreOption: function() {
         var retval = new XQueryParser.p_FTIgnoreOption_return();
@@ -50296,16 +50341,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_UnionExpr671 = null;
+         var p_UnionExpr658 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1935:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
-            // xquery/XQueryParser.g:1935:11: k+= WITHOUT k+= CONTENT p_UnionExpr
+            // xquery/XQueryParser.g:1937:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
+            // xquery/XQueryParser.g:1937:11: k+= WITHOUT k+= CONTENT p_UnionExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15868); if (this.state.failed) return retval;
+            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15916); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -50313,7 +50358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15872); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -50324,12 +50369,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876);
-            p_UnionExpr671=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924);
+            p_UnionExpr658=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr671.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr658.getTree());
 
 
 
@@ -50366,7 +50411,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1945:1: p_Program : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1947:1: p_Program : p_StatementsAndOptionalExpr ;
     // $ANTLR start "p_Program"
     p_Program: function() {
         var retval = new XQueryParser.p_Program_return();
@@ -50374,20 +50419,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr672 = null;
+         var p_StatementsAndOptionalExpr659 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1946:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1946:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1948:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1948:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908);
-            p_StatementsAndOptionalExpr672=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956);
+            p_StatementsAndOptionalExpr659=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr672.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr659.getTree());
 
 
 
@@ -50424,7 +50469,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1950:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
+    // xquery/XQueryParser.g:1952:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
     // $ANTLR start "p_Statements"
     p_Statements: function(strict) {
         var retval = new XQueryParser.p_Statements_return();
@@ -50432,15 +50477,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Hybrid673 = null;
+         var p_Hybrid660 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1951:9: ( ( p_Hybrid[$strict,true] )* )
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:9: ( ( p_Hybrid[$strict,true] )* )
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             loop236:
             do {
                 var alt236=2;
@@ -50453,13 +50498,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt236) {
                 case 1 :
-                    // xquery/XQueryParser.g:1951:11: p_Hybrid[$strict,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15935);
-                    p_Hybrid673=this.p_Hybrid(strict, true);
+                    // xquery/XQueryParser.g:1953:11: p_Hybrid[$strict,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15983);
+                    p_Hybrid660=this.p_Hybrid(strict, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid673.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid660.getTree());
 
 
                     break;
@@ -50505,7 +50550,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1955:1: p_StatementsAndExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1957:1: p_StatementsAndExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndExpr"
     p_StatementsAndExpr: function() {
         var retval = new XQueryParser.p_StatementsAndExpr_return();
@@ -50513,20 +50558,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements674 = null;
+         var p_Statements661 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1956:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1956:11: p_Statements[false]
+            // xquery/XQueryParser.g:1958:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1958:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr15963);
-            p_Statements674=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr16011);
+            p_Statements661=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements674.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements661.getTree());
 
 
 
@@ -50563,7 +50608,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1960:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1962:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndOptionalExpr"
     p_StatementsAndOptionalExpr: function() {
         var retval = new XQueryParser.p_StatementsAndOptionalExpr_return();
@@ -50571,20 +50616,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements675 = null;
+         var p_Statements662 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1961:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1961:11: p_Statements[false]
+            // xquery/XQueryParser.g:1963:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1963:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990);
-            p_Statements675=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038);
+            p_Statements662=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements675.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements662.getTree());
 
 
 
@@ -50621,7 +50666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
+    // xquery/XQueryParser.g:1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
     // $ANTLR start "p_Hybrid"
     p_Hybrid: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Hybrid_return();
@@ -50629,38 +50674,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_HybridExprSingle676 = null;
-         var p_Statement677 = null;
+         var p_HybridExprSingle663 = null;
+         var p_Statement664 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1965:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
+            // xquery/XQueryParser.g:1967:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
             var alt237=2;
             alt237 = this.dfa237.predict(this.input);
             switch (alt237) {
                 case 1 :
-                    // xquery/XQueryParser.g:1965:11: p_HybridExprSingle[$strict,$allowConcat]
+                    // xquery/XQueryParser.g:1967:11: p_HybridExprSingle[$strict,$allowConcat]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16017);
-                    p_HybridExprSingle676=this.p_HybridExprSingle(strict, allowConcat);
+                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16065);
+                    p_HybridExprSingle663=this.p_HybridExprSingle(strict, allowConcat);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle676.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle663.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1966:11: p_Statement
+                    // xquery/XQueryParser.g:1968:11: p_Statement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16030);
-                    p_Statement677=this.p_Statement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16078);
+                    p_Statement664=this.p_Statement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement677.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement664.getTree());
 
 
                     break;
@@ -50705,7 +50750,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1982:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
+    // xquery/XQueryParser.g:1984:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
     // $ANTLR start "p_Statement"
     p_Statement: function() {
         var retval = new XQueryParser.p_Statement_return();
@@ -50713,16 +50758,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AssignStatement678 = null;
-         var p_BreakStatement679 = null;
-         var p_ContinueStatement680 = null;
-         var p_ExitStatement681 = null;
-         var p_VarDeclStatement682 = null;
-         var p_WhileStatement683 = null;
+         var p_AssignStatement665 = null;
+         var p_BreakStatement666 = null;
+         var p_ContinueStatement667 = null;
+         var p_ExitStatement668 = null;
+         var p_VarDeclStatement669 = null;
+         var p_WhileStatement670 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1983:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
+            // xquery/XQueryParser.g:1985:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
             var alt238=6;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -50754,80 +50799,80 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt238) {
                 case 1 :
-                    // xquery/XQueryParser.g:1983:11: p_AssignStatement
+                    // xquery/XQueryParser.g:1985:11: p_AssignStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16061);
-                    p_AssignStatement678=this.p_AssignStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16109);
+                    p_AssignStatement665=this.p_AssignStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement678.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement665.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1984:11: p_BreakStatement
+                    // xquery/XQueryParser.g:1986:11: p_BreakStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16073);
-                    p_BreakStatement679=this.p_BreakStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16121);
+                    p_BreakStatement666=this.p_BreakStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement679.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement666.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1985:11: p_ContinueStatement
+                    // xquery/XQueryParser.g:1987:11: p_ContinueStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16085);
-                    p_ContinueStatement680=this.p_ContinueStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16133);
+                    p_ContinueStatement667=this.p_ContinueStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement680.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement667.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1986:11: p_ExitStatement
+                    // xquery/XQueryParser.g:1988:11: p_ExitStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16097);
-                    p_ExitStatement681=this.p_ExitStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16145);
+                    p_ExitStatement668=this.p_ExitStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement681.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement668.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1987:11: p_VarDeclStatement
+                    // xquery/XQueryParser.g:1989:11: p_VarDeclStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16109);
-                    p_VarDeclStatement682=this.p_VarDeclStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16157);
+                    p_VarDeclStatement669=this.p_VarDeclStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement682.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement669.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1988:11: p_WhileStatement
+                    // xquery/XQueryParser.g:1990:11: p_WhileStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16121);
-                    p_WhileStatement683=this.p_WhileStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16169);
+                    p_WhileStatement670=this.p_WhileStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement683.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement670.getTree());
 
 
                     break;
@@ -50866,7 +50911,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1990:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
+    // xquery/XQueryParser.g:1992:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
     // $ANTLR start "p_HybridExprSingle"
     p_HybridExprSingle: function(strict, allowConcat) {
         var retval = new XQueryParser.p_HybridExprSingle_return();
@@ -50874,17 +50919,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON684 = null;
+        var SEMICOLON671 = null;
          var e = null;
 
-        var SEMICOLON684_tree=null;
+        var SEMICOLON671_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1991:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
-            // xquery/XQueryParser.g:1991:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
+            // xquery/XQueryParser.g:1993:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
+            // xquery/XQueryParser.g:1993:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16148);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16196);
             e=this.p_Expr(strict, allowConcat);
 
             this.state._fsp--;
@@ -50893,10 +50938,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (strict || this.input.LT(1).getType() != SEMICOLON) throw new org.antlr.runtime.RecognitionException(this.input); 
             }
-            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16163); if (this.state.failed) return retval;
+            SEMICOLON671=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16211); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
-            this.adaptor.addChild(root_0, SEMICOLON684_tree);
+            SEMICOLON671_tree = this.adaptor.create(SEMICOLON671);
+            this.adaptor.addChild(root_0, SEMICOLON671_tree);
             }
 
 
@@ -50939,7 +50984,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2026:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
+    // xquery/XQueryParser.g:2028:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
     // $ANTLR start "p_ApplyStatement"
     p_ApplyStatement: function() {
         var retval = new XQueryParser.p_ApplyStatement_return();
@@ -50947,26 +50992,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON686 = null;
-         var p_ExprSimple685 = null;
+        var SEMICOLON673 = null;
+         var p_ExprSimple672 = null;
 
-        var SEMICOLON686_tree=null;
+        var SEMICOLON673_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2027:9: ( p_ExprSimple SEMICOLON )
-            // xquery/XQueryParser.g:2027:11: p_ExprSimple SEMICOLON
+            // xquery/XQueryParser.g:2029:9: ( p_ExprSimple SEMICOLON )
+            // xquery/XQueryParser.g:2029:11: p_ExprSimple SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16213);
-            p_ExprSimple685=this.p_ExprSimple();
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16261);
+            p_ExprSimple672=this.p_ExprSimple();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple685.getTree());
-            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16215); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple672.getTree());
+            SEMICOLON673=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16263); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
-            this.adaptor.addChild(root_0, SEMICOLON686_tree);
+            SEMICOLON673_tree = this.adaptor.create(SEMICOLON673);
+            this.adaptor.addChild(root_0, SEMICOLON673_tree);
             }
 
 
@@ -51004,7 +51049,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2031:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2033:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_AssignStatement"
     p_AssignStatement: function() {
         var retval = new XQueryParser.p_AssignStatement_return();
@@ -51013,26 +51058,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND687 = null;
-        var SEMICOLON689 = null;
+        var BIND674 = null;
+        var SEMICOLON676 = null;
          var v = null;
-         var p_ExprSingle688 = null;
+         var p_ExprSingle675 = null;
 
         var d_tree=null;
-        var BIND687_tree=null;
-        var SEMICOLON689_tree=null;
+        var BIND674_tree=null;
+        var SEMICOLON676_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2032:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2032:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2034:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2034:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16243); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16291); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16247);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16295);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -51041,21 +51086,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND687=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16251); if (this.state.failed) return retval;
+            BIND674=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16299); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND687_tree = this.adaptor.create(BIND687);
-            this.adaptor.addChild(root_0, BIND687_tree);
+            BIND674_tree = this.adaptor.create(BIND674);
+            this.adaptor.addChild(root_0, BIND674_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16253);
-            p_ExprSingle688=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16301);
+            p_ExprSingle675=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle688.getTree());
-            SEMICOLON689=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16256); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle675.getTree());
+            SEMICOLON676=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16304); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON689_tree = this.adaptor.create(SEMICOLON689);
-            this.adaptor.addChild(root_0, SEMICOLON689_tree);
+            SEMICOLON676_tree = this.adaptor.create(SEMICOLON676);
+            this.adaptor.addChild(root_0, SEMICOLON676_tree);
             }
 
 
@@ -51093,7 +51138,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2036:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
+    // xquery/XQueryParser.g:2038:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
     // $ANTLR start "p_BlockStatement"
     p_BlockStatement: function() {
         var retval = new XQueryParser.p_BlockStatement_return();
@@ -51101,33 +51146,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET690 = null;
-        var RBRACKET692 = null;
-         var p_Statements691 = null;
+        var LBRACKET677 = null;
+        var RBRACKET679 = null;
+         var p_Statements678 = null;
 
-        var LBRACKET690_tree=null;
-        var RBRACKET692_tree=null;
+        var LBRACKET677_tree=null;
+        var RBRACKET679_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2037:9: ( LBRACKET p_Statements[false] RBRACKET )
-            // xquery/XQueryParser.g:2037:11: LBRACKET p_Statements[false] RBRACKET
+            // xquery/XQueryParser.g:2039:9: ( LBRACKET p_Statements[false] RBRACKET )
+            // xquery/XQueryParser.g:2039:11: LBRACKET p_Statements[false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET690=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16282); if (this.state.failed) return retval;
+            LBRACKET677=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16330); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET690_tree = this.adaptor.create(LBRACKET690);
-            this.adaptor.addChild(root_0, LBRACKET690_tree);
+            LBRACKET677_tree = this.adaptor.create(LBRACKET677);
+            this.adaptor.addChild(root_0, LBRACKET677_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16284);
-            p_Statements691=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16332);
+            p_Statements678=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements691.getTree());
-            RBRACKET692=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16287); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements678.getTree());
+            RBRACKET679=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16335); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET692_tree = this.adaptor.create(RBRACKET692);
-            this.adaptor.addChild(root_0, RBRACKET692_tree);
+            RBRACKET679_tree = this.adaptor.create(RBRACKET679);
+            this.adaptor.addChild(root_0, RBRACKET679_tree);
             }
 
 
@@ -51165,7 +51210,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2040:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
+    // xquery/XQueryParser.g:2042:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
     // $ANTLR start "p_BlockHybrid"
     p_BlockHybrid: function(strict) {
         var retval = new XQueryParser.p_BlockHybrid_return();
@@ -51173,33 +51218,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET693 = null;
-        var RBRACKET695 = null;
-         var p_Statements694 = null;
+        var LBRACKET680 = null;
+        var RBRACKET682 = null;
+         var p_Statements681 = null;
 
-        var LBRACKET693_tree=null;
-        var RBRACKET695_tree=null;
+        var LBRACKET680_tree=null;
+        var RBRACKET682_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2041:9: ( LBRACKET p_Statements[$strict] RBRACKET )
-            // xquery/XQueryParser.g:2041:11: LBRACKET p_Statements[$strict] RBRACKET
+            // xquery/XQueryParser.g:2043:9: ( LBRACKET p_Statements[$strict] RBRACKET )
+            // xquery/XQueryParser.g:2043:11: LBRACKET p_Statements[$strict] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET693=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16313); if (this.state.failed) return retval;
+            LBRACKET680=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16361); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET693_tree = this.adaptor.create(LBRACKET693);
-            this.adaptor.addChild(root_0, LBRACKET693_tree);
+            LBRACKET680_tree = this.adaptor.create(LBRACKET680);
+            this.adaptor.addChild(root_0, LBRACKET680_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16315);
-            p_Statements694=this.p_Statements(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16363);
+            p_Statements681=this.p_Statements(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements694.getTree());
-            RBRACKET695=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16318); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements681.getTree());
+            RBRACKET682=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16366); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET695_tree = this.adaptor.create(RBRACKET695);
-            this.adaptor.addChild(root_0, RBRACKET695_tree);
+            RBRACKET682_tree = this.adaptor.create(RBRACKET682);
+            this.adaptor.addChild(root_0, RBRACKET682_tree);
             }
 
 
@@ -51237,7 +51282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2045:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2047:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
     // $ANTLR start "p_BreakStatement"
     p_BreakStatement: function() {
         var retval = new XQueryParser.p_BreakStatement_return();
@@ -51246,17 +51291,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON696 = null;
+        var SEMICOLON683 = null;
 
         var k_tree=null;
-        var SEMICOLON696_tree=null;
+        var SEMICOLON683_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2046:9: (k= BREAK k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2046:11: k= BREAK k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2048:9: (k= BREAK k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2048:11: k= BREAK k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16346); if (this.state.failed) return retval;
+            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16394); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51264,7 +51309,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16352); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16400); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51272,10 +51317,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON696=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16356); if (this.state.failed) return retval;
+            SEMICOLON683=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16404); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON696_tree = this.adaptor.create(SEMICOLON696);
-            this.adaptor.addChild(root_0, SEMICOLON696_tree);
+            SEMICOLON683_tree = this.adaptor.create(SEMICOLON683);
+            this.adaptor.addChild(root_0, SEMICOLON683_tree);
             }
 
 
@@ -51313,7 +51358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2050:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2052:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
     // $ANTLR start "p_ContinueStatement"
     p_ContinueStatement: function() {
         var retval = new XQueryParser.p_ContinueStatement_return();
@@ -51322,17 +51367,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON697 = null;
+        var SEMICOLON684 = null;
 
         var k_tree=null;
-        var SEMICOLON697_tree=null;
+        var SEMICOLON684_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2051:9: (k= CONTINUE k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2051:11: k= CONTINUE k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2053:9: (k= CONTINUE k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2053:11: k= CONTINUE k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16384); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51340,7 +51385,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16390); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16438); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51348,10 +51393,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON697=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16394); if (this.state.failed) return retval;
+            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16442); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON697_tree = this.adaptor.create(SEMICOLON697);
-            this.adaptor.addChild(root_0, SEMICOLON697_tree);
+            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
+            this.adaptor.addChild(root_0, SEMICOLON684_tree);
             }
 
 
@@ -51389,7 +51434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2055:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2057:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_ExitStatement"
     p_ExitStatement: function() {
         var retval = new XQueryParser.p_ExitStatement_return();
@@ -51398,18 +51443,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON699 = null;
-         var p_ExprSingle698 = null;
+        var SEMICOLON686 = null;
+         var p_ExprSingle685 = null;
 
         var k_tree=null;
-        var SEMICOLON699_tree=null;
+        var SEMICOLON686_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2056:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2056:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2058:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2058:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16422); if (this.state.failed) return retval;
+            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51417,7 +51462,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16428); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51425,16 +51470,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16432);
-            p_ExprSingle698=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16480);
+            p_ExprSingle685=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle698.getTree());
-            SEMICOLON699=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16435); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle685.getTree());
+            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16483); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON699_tree = this.adaptor.create(SEMICOLON699);
-            this.adaptor.addChild(root_0, SEMICOLON699_tree);
+            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
+            this.adaptor.addChild(root_0, SEMICOLON686_tree);
             }
 
 
@@ -51472,7 +51517,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2060:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
+    // xquery/XQueryParser.g:2062:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
     // $ANTLR start "p_FLWORStatement"
     p_FLWORStatement: function() {
         var retval = new XQueryParser.p_FLWORStatement_return();
@@ -51480,23 +51525,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InitialClause700 = null;
-         var p_IntermediateClause701 = null;
-         var p_ReturnStatement702 = null;
+         var p_InitialClause687 = null;
+         var p_IntermediateClause688 = null;
+         var p_ReturnStatement689 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2061:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
-            // xquery/XQueryParser.g:2061:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
+            // xquery/XQueryParser.g:2063:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
+            // xquery/XQueryParser.g:2063:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16461);
-            p_InitialClause700=this.p_InitialClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16509);
+            p_InitialClause687=this.p_InitialClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause700.getTree());
-            // xquery/XQueryParser.g:2061:27: ( p_IntermediateClause )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause687.getTree());
+            // xquery/XQueryParser.g:2063:27: ( p_IntermediateClause )*
             loop239:
             do {
                 var alt239=2;
@@ -51509,13 +51554,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt239) {
                 case 1 :
-                    // xquery/XQueryParser.g:2061:27: p_IntermediateClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463);
-                    p_IntermediateClause701=this.p_IntermediateClause();
+                    // xquery/XQueryParser.g:2063:27: p_IntermediateClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511);
+                    p_IntermediateClause688=this.p_IntermediateClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause701.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause688.getTree());
 
 
                     break;
@@ -51525,12 +51570,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466);
-            p_ReturnStatement702=this.p_ReturnStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514);
+            p_ReturnStatement689=this.p_ReturnStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement702.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement689.getTree());
 
 
 
@@ -51567,7 +51612,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2065:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2067:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_ReturnStatement"
     p_ReturnStatement: function() {
         var retval = new XQueryParser.p_ReturnStatement_return();
@@ -51576,16 +51621,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid703 = null;
+         var p_Hybrid690 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2066:9: (k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2066:11: k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2068:9: (k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2068:11: k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16498); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16546); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51593,12 +51638,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16502);
-            p_Hybrid703=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16550);
+            p_Hybrid690=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid703.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid690.getTree());
 
 
 
@@ -51635,7 +51680,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2070:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2072:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
     // $ANTLR start "p_IfStatement"
     p_IfStatement: function() {
         var retval = new XQueryParser.p_IfStatement_return();
@@ -51644,22 +51689,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN704 = null;
-        var RPAREN706 = null;
-         var p_Expr705 = null;
-         var p_Hybrid707 = null;
-         var p_Hybrid708 = null;
+        var LPAREN691 = null;
+        var RPAREN693 = null;
+         var p_Expr692 = null;
+         var p_Hybrid694 = null;
+         var p_Hybrid695 = null;
 
         var k_tree=null;
-        var LPAREN704_tree=null;
-        var RPAREN706_tree=null;
+        var LPAREN691_tree=null;
+        var RPAREN693_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2071:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2071:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2073:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2073:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16531); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16579); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51667,23 +51712,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN704=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16535); if (this.state.failed) return retval;
+            LPAREN691=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16583); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN704_tree = this.adaptor.create(LPAREN704);
-            this.adaptor.addChild(root_0, LPAREN704_tree);
+            LPAREN691_tree = this.adaptor.create(LPAREN691);
+            this.adaptor.addChild(root_0, LPAREN691_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16537);
-            p_Expr705=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16585);
+            p_Expr692=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr705.getTree());
-            RPAREN706=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16540); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr692.getTree());
+            RPAREN693=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16588); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN706_tree = this.adaptor.create(RPAREN706);
-            this.adaptor.addChild(root_0, RPAREN706_tree);
+            RPAREN693_tree = this.adaptor.create(RPAREN693);
+            this.adaptor.addChild(root_0, RPAREN693_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16544); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16592); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51691,13 +51736,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16548);
-            p_Hybrid707=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16596);
+            p_Hybrid694=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid707.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16553); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid694.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16601); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51705,12 +51750,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16557);
-            p_Hybrid708=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16605);
+            p_Hybrid695=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid708.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid695.getTree());
 
 
 
@@ -51747,7 +51792,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2075:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2077:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchStatement"
     p_SwitchStatement: function() {
         var retval = new XQueryParser.p_SwitchStatement_return();
@@ -51756,22 +51801,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN709 = null;
-        var RPAREN711 = null;
-         var p_Expr710 = null;
-         var p_SwitchCaseStatement712 = null;
-         var p_Hybrid713 = null;
+        var LPAREN696 = null;
+        var RPAREN698 = null;
+         var p_Expr697 = null;
+         var p_SwitchCaseStatement699 = null;
+         var p_Hybrid700 = null;
 
         var k_tree=null;
-        var LPAREN709_tree=null;
-        var RPAREN711_tree=null;
+        var LPAREN696_tree=null;
+        var RPAREN698_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2076:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2076:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2078:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2078:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16586); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16634); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51779,23 +51824,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16590); if (this.state.failed) return retval;
+            LPAREN696=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16638); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN709_tree = this.adaptor.create(LPAREN709);
-            this.adaptor.addChild(root_0, LPAREN709_tree);
+            LPAREN696_tree = this.adaptor.create(LPAREN696);
+            this.adaptor.addChild(root_0, LPAREN696_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16592);
-            p_Expr710=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16640);
+            p_Expr697=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
-            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16595); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr697.getTree());
+            RPAREN698=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16643); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN711_tree = this.adaptor.create(RPAREN711);
-            this.adaptor.addChild(root_0, RPAREN711_tree);
+            RPAREN698_tree = this.adaptor.create(RPAREN698);
+            this.adaptor.addChild(root_0, RPAREN698_tree);
             }
-            // xquery/XQueryParser.g:2076:67: ( p_SwitchCaseStatement )+
+            // xquery/XQueryParser.g:2078:67: ( p_SwitchCaseStatement )+
             var cnt240=0;
             loop240:
             do {
@@ -51809,13 +51854,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt240) {
                 case 1 :
-                    // xquery/XQueryParser.g:2076:67: p_SwitchCaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597);
-                    p_SwitchCaseStatement712=this.p_SwitchCaseStatement();
+                    // xquery/XQueryParser.g:2078:67: p_SwitchCaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645);
+                    p_SwitchCaseStatement699=this.p_SwitchCaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement712.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement699.getTree());
 
 
                     break;
@@ -51831,7 +51876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt240++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16602); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51839,7 +51884,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16608); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16656); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51847,12 +51892,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16612);
-            p_Hybrid713=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16660);
+            p_Hybrid700=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid700.getTree());
 
 
 
@@ -51889,7 +51934,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2080:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2082:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchCaseStatement"
     p_SwitchCaseStatement: function() {
         var retval = new XQueryParser.p_SwitchCaseStatement_return();
@@ -51898,17 +51943,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand714 = null;
-         var p_Hybrid715 = null;
+         var p_SwitchCaseOperand701 = null;
+         var p_Hybrid702 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2081:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2083:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+
             var cnt241=0;
             loop241:
             do {
@@ -51922,8 +51967,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt241) {
                 case 1 :
-                    // xquery/XQueryParser.g:2081:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16642); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2083:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16690); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -51931,12 +51976,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646);
-                    p_SwitchCaseOperand714=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694);
+                    p_SwitchCaseOperand701=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand714.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand701.getTree());
 
 
                     break;
@@ -51952,7 +51997,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt241++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16652); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51960,12 +52005,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656);
-            p_Hybrid715=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704);
+            p_Hybrid702=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid715.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid702.getTree());
 
 
 
@@ -52002,7 +52047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2085:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
+    // xquery/XQueryParser.g:2087:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
     // $ANTLR start "p_TryCatchStatement"
     p_TryCatchStatement: function() {
         var retval = new XQueryParser.p_TryCatchStatement_return();
@@ -52011,18 +52056,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockStatement716 = null;
-         var p_CatchErrorList717 = null;
-         var p_BlockStatement718 = null;
+         var p_BlockStatement703 = null;
+         var p_CatchErrorList704 = null;
+         var p_BlockStatement705 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2086:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
-            // xquery/XQueryParser.g:2086:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
+            // xquery/XQueryParser.g:2088:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
+            // xquery/XQueryParser.g:2088:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16685); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52030,13 +52075,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689);
-            p_BlockStatement716=this.p_BlockStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737);
+            p_BlockStatement703=this.p_BlockStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement716.getTree());
-            // xquery/XQueryParser.g:2086:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement703.getTree());
+            // xquery/XQueryParser.g:2088:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
             var cnt242=0;
             loop242:
             do {
@@ -52050,8 +52095,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt242) {
                 case 1 :
-                    // xquery/XQueryParser.g:2086:50: k= CATCH p_CatchErrorList p_BlockStatement
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16694); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2088:50: k= CATCH p_CatchErrorList p_BlockStatement
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16742); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -52059,18 +52104,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698);
-                    p_CatchErrorList717=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746);
+                    p_CatchErrorList704=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList717.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700);
-                    p_BlockStatement718=this.p_BlockStatement();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList704.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748);
+                    p_BlockStatement705=this.p_BlockStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement718.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement705.getTree());
 
 
                     break;
@@ -52125,7 +52170,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2089:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
+    // xquery/XQueryParser.g:2091:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
     // $ANTLR start "p_TryCatchHybrid"
     p_TryCatchHybrid: function(strict) {
         var retval = new XQueryParser.p_TryCatchHybrid_return();
@@ -52134,18 +52179,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockHybrid719 = null;
-         var p_CatchErrorList720 = null;
-         var p_BlockHybrid721 = null;
+         var p_BlockHybrid706 = null;
+         var p_CatchErrorList707 = null;
+         var p_BlockHybrid708 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2090:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
-            // xquery/XQueryParser.g:2090:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            // xquery/XQueryParser.g:2092:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
+            // xquery/XQueryParser.g:2092:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16732); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16780); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52153,13 +52198,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736);
-            p_BlockHybrid719=this.p_BlockHybrid(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784);
+            p_BlockHybrid706=this.p_BlockHybrid(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid719.getTree());
-            // xquery/XQueryParser.g:2090:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid706.getTree());
+            // xquery/XQueryParser.g:2092:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             var cnt243=0;
             loop243:
             do {
@@ -52173,8 +52218,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt243) {
                 case 1 :
-                    // xquery/XQueryParser.g:2090:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16742); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2092:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16790); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -52182,18 +52227,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746);
-                    p_CatchErrorList720=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794);
+                    p_CatchErrorList707=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList720.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748);
-                    p_BlockHybrid721=this.p_BlockHybrid(strict);
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList707.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796);
+                    p_BlockHybrid708=this.p_BlockHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid721.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid708.getTree());
 
 
                     break;
@@ -52248,7 +52293,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2094:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2096:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_TypeswitchStatement"
     p_TypeswitchStatement: function() {
         var retval = new XQueryParser.p_TypeswitchStatement_return();
@@ -52258,24 +52303,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN722 = null;
-        var RPAREN724 = null;
+        var LPAREN709 = null;
+        var RPAREN711 = null;
          var v = null;
-         var p_Expr723 = null;
-         var p_CaseStatement725 = null;
-         var p_Hybrid726 = null;
+         var p_Expr710 = null;
+         var p_CaseStatement712 = null;
+         var p_Hybrid713 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN722_tree=null;
-        var RPAREN724_tree=null;
+        var LPAREN709_tree=null;
+        var RPAREN711_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2095:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2095:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2097:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2097:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52283,23 +52328,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN722=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16785); if (this.state.failed) return retval;
+            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16833); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN722_tree = this.adaptor.create(LPAREN722);
-            this.adaptor.addChild(root_0, LPAREN722_tree);
+            LPAREN709_tree = this.adaptor.create(LPAREN709);
+            this.adaptor.addChild(root_0, LPAREN709_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16787);
-            p_Expr723=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16835);
+            p_Expr710=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr723.getTree());
-            RPAREN724=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16790); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
+            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16838); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN724_tree = this.adaptor.create(RPAREN724);
-            this.adaptor.addChild(root_0, RPAREN724_tree);
+            RPAREN711_tree = this.adaptor.create(RPAREN711);
+            this.adaptor.addChild(root_0, RPAREN711_tree);
             }
-            // xquery/XQueryParser.g:2095:71: ( p_CaseStatement )+
+            // xquery/XQueryParser.g:2097:71: ( p_CaseStatement )+
             var cnt244=0;
             loop244:
             do {
@@ -52313,13 +52358,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt244) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:71: p_CaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792);
-                    p_CaseStatement725=this.p_CaseStatement();
+                    // xquery/XQueryParser.g:2097:71: p_CaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840);
+                    p_CaseStatement712=this.p_CaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement725.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement712.getTree());
 
 
                     break;
@@ -52335,7 +52380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt244++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16797); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16845); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52343,7 +52388,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2095:113: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:2097:113: (d= DOLLAR v= p_VarName )?
             var alt245=2;
             var LA245_0 = this.input.LA(1);
 
@@ -52352,13 +52397,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt245) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:114: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16804); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2097:114: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16852); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16808);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16856);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -52373,7 +52418,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16816); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16864); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52381,12 +52426,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820);
-            p_Hybrid726=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868);
+            p_Hybrid713=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid726.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
 
 
 
@@ -52423,7 +52468,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2099:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2101:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_CaseStatement"
     p_CaseStatement: function() {
         var retval = new XQueryParser.p_CaseStatement_return();
@@ -52433,21 +52478,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var AS727 = null;
+        var AS714 = null;
          var v = null;
-         var p_SequenceType728 = null;
-         var p_Hybrid729 = null;
+         var p_SequenceType715 = null;
+         var p_Hybrid716 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var AS727_tree=null;
+        var AS714_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2100:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2100:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2102:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2102:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16849); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16897); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52455,7 +52500,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2100:33: (d= DOLLAR v= p_VarName AS )?
+            // xquery/XQueryParser.g:2102:33: (d= DOLLAR v= p_VarName AS )?
             var alt246=2;
             var LA246_0 = this.input.LA(1);
 
@@ -52464,13 +52509,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt246) {
                 case 1 :
-                    // xquery/XQueryParser.g:2100:34: d= DOLLAR v= p_VarName AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16856); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2102:34: d= DOLLAR v= p_VarName AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16904); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16860);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16908);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -52479,10 +52524,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    AS727=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16864); if (this.state.failed) return retval;
+                    AS714=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16912); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    AS727_tree = this.adaptor.create(AS727);
-                    this.adaptor.addChild(root_0, AS727_tree);
+                    AS714_tree = this.adaptor.create(AS714);
+                    this.adaptor.addChild(root_0, AS714_tree);
                     }
 
 
@@ -52490,13 +52535,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16868);
-            p_SequenceType728=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16916);
+            p_SequenceType715=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType728.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16872); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType715.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52504,12 +52549,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16876);
-            p_Hybrid729=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16924);
+            p_Hybrid716=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid716.getTree());
 
 
 
@@ -52546,7 +52591,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2104:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
+    // xquery/XQueryParser.g:2106:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
     // $ANTLR start "p_VarDeclStatement"
     p_VarDeclStatement: function() {
         var retval = new XQueryParser.p_VarDeclStatement_return();
@@ -52557,32 +52602,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var BIND732 = null;
-        var COMMA734 = null;
-        var BIND736 = null;
-        var SEMICOLON738 = null;
+        var BIND719 = null;
+        var COMMA721 = null;
+        var BIND723 = null;
+        var SEMICOLON725 = null;
          var v = null;
          var w = null;
-         var p_Annotation730 = null;
-         var p_TypeDeclaration731 = null;
-         var p_ExprSingle733 = null;
-         var p_TypeDeclaration735 = null;
-         var p_ExprSingle737 = null;
+         var p_Annotation717 = null;
+         var p_TypeDeclaration718 = null;
+         var p_ExprSingle720 = null;
+         var p_TypeDeclaration722 = null;
+         var p_ExprSingle724 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var BIND732_tree=null;
-        var COMMA734_tree=null;
-        var BIND736_tree=null;
-        var SEMICOLON738_tree=null;
+        var BIND719_tree=null;
+        var COMMA721_tree=null;
+        var BIND723_tree=null;
+        var SEMICOLON725_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2105:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
+            // xquery/XQueryParser.g:2107:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )*
             loop247:
             do {
                 var alt247=2;
@@ -52595,13 +52640,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt247) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16903);
-                    p_Annotation730=this.p_Annotation();
+                    // xquery/XQueryParser.g:2107:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16951);
+                    p_Annotation717=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation730.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation717.getTree());
 
 
                     break;
@@ -52611,7 +52656,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16908); if (this.state.failed) return retval;
+            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16956); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52619,12 +52664,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16914); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16962); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16918);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16966);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -52633,7 +52678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:2105:98: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:2107:98: ( p_TypeDeclaration )?
             var alt248=2;
             var LA248_0 = this.input.LA(1);
 
@@ -52642,20 +52687,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt248) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:98: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922);
-                    p_TypeDeclaration731=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:2107:98: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970);
+                    p_TypeDeclaration718=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration731.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration718.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2105:117: ( BIND p_ExprSingle[true] )?
+            // xquery/XQueryParser.g:2107:117: ( BIND p_ExprSingle[true] )?
             var alt249=2;
             var LA249_0 = this.input.LA(1);
 
@@ -52664,25 +52709,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt249) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:118: BIND p_ExprSingle[true]
-                    BIND732=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2107:118: BIND p_ExprSingle[true]
+                    BIND719=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND732_tree = this.adaptor.create(BIND732);
-                    this.adaptor.addChild(root_0, BIND732_tree);
+                    BIND719_tree = this.adaptor.create(BIND719);
+                    this.adaptor.addChild(root_0, BIND719_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928);
-                    p_ExprSingle733=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976);
+                    p_ExprSingle720=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle733.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle720.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2106:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
+            // xquery/XQueryParser.g:2108:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
             loop252:
             do {
                 var alt252=2;
@@ -52695,18 +52740,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt252) {
                 case 1 :
-                    // xquery/XQueryParser.g:2106:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
-                    COMMA734=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16944); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2108:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
+                    COMMA721=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA734_tree = this.adaptor.create(COMMA734);
-                    this.adaptor.addChild(root_0, COMMA734_tree);
+                    COMMA721_tree = this.adaptor.create(COMMA721);
+                    this.adaptor.addChild(root_0, COMMA721_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16948); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16952);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement17000);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -52715,7 +52760,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    // xquery/XQueryParser.g:2106:65: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:2108:65: ( p_TypeDeclaration )?
                     var alt250=2;
                     var LA250_0 = this.input.LA(1);
 
@@ -52724,20 +52769,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt250) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:65: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956);
-                            p_TypeDeclaration735=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:2108:65: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004);
+                            p_TypeDeclaration722=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration735.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration722.getTree());
 
 
                             break;
 
                     }
 
-                    // xquery/XQueryParser.g:2106:84: ( BIND p_ExprSingle[true] )?
+                    // xquery/XQueryParser.g:2108:84: ( BIND p_ExprSingle[true] )?
                     var alt251=2;
                     var LA251_0 = this.input.LA(1);
 
@@ -52746,18 +52791,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt251) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:85: BIND p_ExprSingle[true]
-                            BIND736=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16960); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:2108:85: BIND p_ExprSingle[true]
+                            BIND723=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement17008); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            BIND736_tree = this.adaptor.create(BIND736);
-                            this.adaptor.addChild(root_0, BIND736_tree);
+                            BIND723_tree = this.adaptor.create(BIND723);
+                            this.adaptor.addChild(root_0, BIND723_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962);
-                            p_ExprSingle737=this.p_ExprSingle(true);
+                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010);
+                            p_ExprSingle724=this.p_ExprSingle(true);
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle737.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle724.getTree());
 
 
                             break;
@@ -52773,10 +52818,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            SEMICOLON738=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement16979); if (this.state.failed) return retval;
+            SEMICOLON725=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement17027); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON738_tree = this.adaptor.create(SEMICOLON738);
-            this.adaptor.addChild(root_0, SEMICOLON738_tree);
+            SEMICOLON725_tree = this.adaptor.create(SEMICOLON725);
+            this.adaptor.addChild(root_0, SEMICOLON725_tree);
             }
 
 
@@ -52814,7 +52859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2111:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2113:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
     // $ANTLR start "p_WhileStatement"
     p_WhileStatement: function() {
         var retval = new XQueryParser.p_WhileStatement_return();
@@ -52823,21 +52868,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN739 = null;
-        var RPAREN741 = null;
-         var p_Expr740 = null;
-         var p_Hybrid742 = null;
+        var LPAREN726 = null;
+        var RPAREN728 = null;
+         var p_Expr727 = null;
+         var p_Hybrid729 = null;
 
         var k_tree=null;
-        var LPAREN739_tree=null;
-        var RPAREN741_tree=null;
+        var LPAREN726_tree=null;
+        var RPAREN728_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2112:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2112:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2114:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2114:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17007); if (this.state.failed) return retval;
+            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17055); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52845,28 +52890,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN739=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17011); if (this.state.failed) return retval;
+            LPAREN726=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17059); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN739_tree = this.adaptor.create(LPAREN739);
-            this.adaptor.addChild(root_0, LPAREN739_tree);
+            LPAREN726_tree = this.adaptor.create(LPAREN726);
+            this.adaptor.addChild(root_0, LPAREN726_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17013);
-            p_Expr740=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17061);
+            p_Expr727=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr740.getTree());
-            RPAREN741=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17016); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr727.getTree());
+            RPAREN728=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17064); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN741_tree = this.adaptor.create(RPAREN741);
-            this.adaptor.addChild(root_0, RPAREN741_tree);
+            RPAREN728_tree = this.adaptor.create(RPAREN728);
+            this.adaptor.addChild(root_0, RPAREN728_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17018);
-            p_Hybrid742=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17066);
+            p_Hybrid729=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid742.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
 
 
 
@@ -52903,7 +52948,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
+    // xquery/XQueryParser.g:2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
     // $ANTLR start "p_ExprSimple"
     p_ExprSimple: function() {
         var retval = new XQueryParser.p_ExprSimple_return();
@@ -52911,56 +52956,56 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuantifiedExpr743 = null;
-         var p_OrExpr744 = null;
-         var pg_UpdateExpr745 = null;
+         var p_QuantifiedExpr730 = null;
+         var p_OrExpr731 = null;
+         var pg_UpdateExpr732 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2117:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
+            // xquery/XQueryParser.g:2119:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
             var alt253=3;
             alt253 = this.dfa253.predict(this.input);
             switch (alt253) {
                 case 1 :
-                    // xquery/XQueryParser.g:2117:11: p_QuantifiedExpr
+                    // xquery/XQueryParser.g:2119:11: p_QuantifiedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045);
-                    p_QuantifiedExpr743=this.p_QuantifiedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093);
+                    p_QuantifiedExpr730=this.p_QuantifiedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr743.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr730.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2118:11: p_OrExpr
+                    // xquery/XQueryParser.g:2120:11: p_OrExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17057);
-                    p_OrExpr744=this.p_OrExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17105);
+                    p_OrExpr731=this.p_OrExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr744.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr731.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2119:11: {...}? => pg_UpdateExpr
+                    // xquery/XQueryParser.g:2121:11: {...}? => pg_UpdateExpr
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ExprSimple", "this.lc(XQU)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072);
-                    pg_UpdateExpr745=this.pg_UpdateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120);
+                    pg_UpdateExpr732=this.pg_UpdateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr745.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr732.getTree());
 
 
                     break;
@@ -52999,7 +53044,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2123:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
+    // xquery/XQueryParser.g:2125:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
     // $ANTLR start "p_BlockExpr"
     p_BlockExpr: function() {
         var retval = new XQueryParser.p_BlockExpr_return();
@@ -53007,33 +53052,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET746 = null;
-        var RBRACKET748 = null;
-         var p_StatementsAndExpr747 = null;
+        var LBRACKET733 = null;
+        var RBRACKET735 = null;
+         var p_StatementsAndExpr734 = null;
 
-        var LBRACKET746_tree=null;
-        var RBRACKET748_tree=null;
+        var LBRACKET733_tree=null;
+        var RBRACKET735_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2124:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
-            // xquery/XQueryParser.g:2124:11: LBRACKET p_StatementsAndExpr RBRACKET
+            // xquery/XQueryParser.g:2126:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
+            // xquery/XQueryParser.g:2126:11: LBRACKET p_StatementsAndExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET746=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17098); if (this.state.failed) return retval;
+            LBRACKET733=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17146); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET746_tree = this.adaptor.create(LBRACKET746);
-            this.adaptor.addChild(root_0, LBRACKET746_tree);
+            LBRACKET733_tree = this.adaptor.create(LBRACKET733);
+            this.adaptor.addChild(root_0, LBRACKET733_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100);
-            p_StatementsAndExpr747=this.p_StatementsAndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148);
+            p_StatementsAndExpr734=this.p_StatementsAndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr747.getTree());
-            RBRACKET748=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17102); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr734.getTree());
+            RBRACKET735=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17150); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET748_tree = this.adaptor.create(RBRACKET748);
-            this.adaptor.addChild(root_0, RBRACKET748_tree);
+            RBRACKET735_tree = this.adaptor.create(RBRACKET735);
+            this.adaptor.addChild(root_0, RBRACKET735_tree);
             }
 
 
@@ -53071,7 +53116,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2131:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
+    // xquery/XQueryParser.g:2133:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
     // $ANTLR start "p_CollectionDecl"
     p_CollectionDecl: function() {
         var retval = new XQueryParser.p_CollectionDecl_return();
@@ -53080,17 +53125,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName749 = null;
-         var p_CollectionTypeDecl750 = null;
+         var p_QName736 = null;
+         var p_CollectionTypeDecl737 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2132:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
-            // xquery/XQueryParser.g:2132:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
+            // xquery/XQueryParser.g:2134:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
+            // xquery/XQueryParser.g:2134:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17133); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53098,13 +53143,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17137);
-            p_QName749=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17185);
+            p_QName736=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName749.getTree());
-            // xquery/XQueryParser.g:2132:47: ( p_CollectionTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName736.getTree());
+            // xquery/XQueryParser.g:2134:47: ( p_CollectionTypeDecl )?
             var alt254=2;
             var LA254_0 = this.input.LA(1);
 
@@ -53113,13 +53158,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt254) {
                 case 1 :
-                    // xquery/XQueryParser.g:2132:47: p_CollectionTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139);
-                    p_CollectionTypeDecl750=this.p_CollectionTypeDecl();
+                    // xquery/XQueryParser.g:2134:47: p_CollectionTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187);
+                    p_CollectionTypeDecl737=this.p_CollectionTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl750.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl737.getTree());
 
 
                     break;
@@ -53162,7 +53207,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2135:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
+    // xquery/XQueryParser.g:2137:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
     // $ANTLR start "p_CollectionTypeDecl"
     p_CollectionTypeDecl: function() {
         var retval = new XQueryParser.p_CollectionTypeDecl_return();
@@ -53171,19 +53216,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_KindTest751 = null;
-         var p_OccurrenceIndicator752 = null;
+         var p_KindTest738 = null;
+         var p_OccurrenceIndicator739 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2136:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2136:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17168); if (this.state.failed) return retval;
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53191,13 +53236,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172);
-            p_KindTest751=this.p_KindTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220);
+            p_KindTest738=this.p_KindTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest751.getTree());
-            // xquery/XQueryParser.g:2136:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest738.getTree());
+            // xquery/XQueryParser.g:2138:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
             var alt255=2;
             var LA255_0 = this.input.LA(1);
 
@@ -53206,13 +53251,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt255) {
                 case 1 :
-                    // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181);
-                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229);
+                    p_OccurrenceIndicator739=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator739.getTree());
 
 
                     break;
@@ -53258,7 +53303,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2139:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
+    // xquery/XQueryParser.g:2141:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
     // $ANTLR start "p_IndexDecl"
     p_IndexDecl: function() {
         var retval = new XQueryParser.p_IndexDecl_return();
@@ -53267,21 +53312,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA756 = null;
-         var p_IndexName753 = null;
-         var p_IndexDomainExpr754 = null;
-         var p_IndexKeySpec755 = null;
-         var p_IndexKeySpec757 = null;
+        var COMMA743 = null;
+         var p_IndexName740 = null;
+         var p_IndexDomainExpr741 = null;
+         var p_IndexKeySpec742 = null;
+         var p_IndexKeySpec744 = null;
 
         var k_tree=null;
-        var COMMA756_tree=null;
+        var COMMA743_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2140:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
-            // xquery/XQueryParser.g:2140:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
+            // xquery/XQueryParser.g:2142:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
+            // xquery/XQueryParser.g:2142:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17211); if (this.state.failed) return retval;
+            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17259); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53289,13 +53334,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17215);
-            p_IndexName753=this.p_IndexName();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17263);
+            p_IndexName740=this.p_IndexName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName753.getTree());
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17219); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName740.getTree());
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17267); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53303,7 +53348,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17225); if (this.state.failed) return retval;
+            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17273); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53311,13 +53356,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229);
-            p_IndexDomainExpr754=this.p_IndexDomainExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277);
+            p_IndexDomainExpr741=this.p_IndexDomainExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr754.getTree());
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17233); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr741.getTree());
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17281); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53325,13 +53370,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237);
-            p_IndexKeySpec755=this.p_IndexKeySpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285);
+            p_IndexKeySpec742=this.p_IndexKeySpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec755.getTree());
-            // xquery/XQueryParser.g:2140:142: ( COMMA p_IndexKeySpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec742.getTree());
+            // xquery/XQueryParser.g:2142:142: ( COMMA p_IndexKeySpec )*
             loop256:
             do {
                 var alt256=2;
@@ -53344,18 +53389,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt256) {
                 case 1 :
-                    // xquery/XQueryParser.g:2140:143: COMMA p_IndexKeySpec
-                    COMMA756=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17240); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2142:143: COMMA p_IndexKeySpec
+                    COMMA743=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA756_tree = this.adaptor.create(COMMA756);
-                    this.adaptor.addChild(root_0, COMMA756_tree);
+                    COMMA743_tree = this.adaptor.create(COMMA743);
+                    this.adaptor.addChild(root_0, COMMA743_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242);
-                    p_IndexKeySpec757=this.p_IndexKeySpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290);
+                    p_IndexKeySpec744=this.p_IndexKeySpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec757.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec744.getTree());
 
 
                     break;
@@ -53401,7 +53446,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2143:1: p_IndexName : p_QName ;
+    // xquery/XQueryParser.g:2145:1: p_IndexName : p_QName ;
     // $ANTLR start "p_IndexName"
     p_IndexName: function() {
         var retval = new XQueryParser.p_IndexName_return();
@@ -53409,20 +53454,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName758 = null;
+         var p_QName745 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2144:9: ( p_QName )
-            // xquery/XQueryParser.g:2144:11: p_QName
+            // xquery/XQueryParser.g:2146:9: ( p_QName )
+            // xquery/XQueryParser.g:2146:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17269);
-            p_QName758=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17317);
+            p_QName745=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName745.getTree());
 
 
 
@@ -53459,7 +53504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2147:1: p_IndexDomainExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2149:1: p_IndexDomainExpr : p_PathExpr ;
     // $ANTLR start "p_IndexDomainExpr"
     p_IndexDomainExpr: function() {
         var retval = new XQueryParser.p_IndexDomainExpr_return();
@@ -53467,20 +53512,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr759 = null;
+         var p_PathExpr746 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2148:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2148:11: p_PathExpr
+            // xquery/XQueryParser.g:2150:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2150:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294);
-            p_PathExpr759=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342);
+            p_PathExpr746=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr759.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr746.getTree());
 
 
 
@@ -53517,7 +53562,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2151:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
+    // xquery/XQueryParser.g:2153:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
     // $ANTLR start "p_IndexKeySpec"
     p_IndexKeySpec: function() {
         var retval = new XQueryParser.p_IndexKeySpec_return();
@@ -53525,23 +53570,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_IndexKeyExpr760 = null;
-         var p_IndexKeyTypeDecl761 = null;
-         var p_IndexKeyCollation762 = null;
+         var p_IndexKeyExpr747 = null;
+         var p_IndexKeyTypeDecl748 = null;
+         var p_IndexKeyCollation749 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2152:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
-            // xquery/XQueryParser.g:2152:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
+            // xquery/XQueryParser.g:2154:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319);
-            p_IndexKeyExpr760=this.p_IndexKeyExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367);
+            p_IndexKeyExpr747=this.p_IndexKeyExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr760.getTree());
-            // xquery/XQueryParser.g:2152:26: ( p_IndexKeyTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr747.getTree());
+            // xquery/XQueryParser.g:2154:26: ( p_IndexKeyTypeDecl )?
             var alt257=2;
             var LA257_0 = this.input.LA(1);
 
@@ -53550,20 +53595,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt257) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:26: p_IndexKeyTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321);
-                    p_IndexKeyTypeDecl761=this.p_IndexKeyTypeDecl();
+                    // xquery/XQueryParser.g:2154:26: p_IndexKeyTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369);
+                    p_IndexKeyTypeDecl748=this.p_IndexKeyTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl761.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl748.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2152:46: ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:46: ( p_IndexKeyCollation )?
             var alt258=2;
             var LA258_0 = this.input.LA(1);
 
@@ -53572,13 +53617,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt258) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:46: p_IndexKeyCollation
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324);
-                    p_IndexKeyCollation762=this.p_IndexKeyCollation();
+                    // xquery/XQueryParser.g:2154:46: p_IndexKeyCollation
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372);
+                    p_IndexKeyCollation749=this.p_IndexKeyCollation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation762.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation749.getTree());
 
 
                     break;
@@ -53621,7 +53666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2155:1: p_IndexKeyExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2157:1: p_IndexKeyExpr : p_PathExpr ;
     // $ANTLR start "p_IndexKeyExpr"
     p_IndexKeyExpr: function() {
         var retval = new XQueryParser.p_IndexKeyExpr_return();
@@ -53629,20 +53674,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr763 = null;
+         var p_PathExpr750 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2156:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2156:11: p_PathExpr
+            // xquery/XQueryParser.g:2158:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2158:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350);
-            p_PathExpr763=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398);
+            p_PathExpr750=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr750.getTree());
 
 
 
@@ -53679,7 +53724,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2159:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
+    // xquery/XQueryParser.g:2161:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
     // $ANTLR start "p_IndexKeyTypeDecl"
     p_IndexKeyTypeDecl: function() {
         var retval = new XQueryParser.p_IndexKeyTypeDecl_return();
@@ -53688,17 +53733,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_AtomicType764 = null;
-         var p_OccurrenceIndicator765 = null;
+         var p_AtomicType751 = null;
+         var p_OccurrenceIndicator752 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2160:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2160:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
+            // xquery/XQueryParser.g:2162:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2162:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17377); if (this.state.failed) return retval;
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17425); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53706,13 +53751,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381);
-            p_AtomicType764=this.p_AtomicType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429);
+            p_AtomicType751=this.p_AtomicType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType764.getTree());
-            // xquery/XQueryParser.g:2160:44: ( p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType751.getTree());
+            // xquery/XQueryParser.g:2162:44: ( p_OccurrenceIndicator )?
             var alt259=2;
             var LA259_0 = this.input.LA(1);
 
@@ -53721,13 +53766,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt259) {
                 case 1 :
-                    // xquery/XQueryParser.g:2160:44: p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383);
-                    p_OccurrenceIndicator765=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2162:44: p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431);
+                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator765.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
 
 
                     break;
@@ -53770,7 +53815,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2163:1: p_AtomicType : p_QName ;
+    // xquery/XQueryParser.g:2165:1: p_AtomicType : p_QName ;
     // $ANTLR start "p_AtomicType"
     p_AtomicType: function() {
         var retval = new XQueryParser.p_AtomicType_return();
@@ -53778,20 +53823,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName766 = null;
+         var p_QName753 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2164:9: ( p_QName )
-            // xquery/XQueryParser.g:2164:11: p_QName
+            // xquery/XQueryParser.g:2166:9: ( p_QName )
+            // xquery/XQueryParser.g:2166:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17409);
-            p_QName766=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17457);
+            p_QName753=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName766.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName753.getTree());
 
 
 
@@ -53828,7 +53873,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2167:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
+    // xquery/XQueryParser.g:2169:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
     // $ANTLR start "p_IndexKeyCollation"
     p_IndexKeyCollation: function() {
         var retval = new XQueryParser.p_IndexKeyCollation_return();
@@ -53837,16 +53882,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_StringLiteral767 = null;
+         var p_StringLiteral754 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2168:9: (k= COLLATION p_StringLiteral )
-            // xquery/XQueryParser.g:2168:11: k= COLLATION p_StringLiteral
+            // xquery/XQueryParser.g:2170:9: (k= COLLATION p_StringLiteral )
+            // xquery/XQueryParser.g:2170:11: k= COLLATION p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17436); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17484); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53854,12 +53899,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440);
-            p_StringLiteral767=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488);
+            p_StringLiteral754=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral767.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral754.getTree());
 
 
 
@@ -53896,7 +53941,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2171:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
+    // xquery/XQueryParser.g:2173:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
     // $ANTLR start "p_ICDecl"
     p_ICDecl: function() {
         var retval = new XQueryParser.p_ICDecl_return();
@@ -53905,18 +53950,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName768 = null;
-         var p_ICCollection769 = null;
-         var p_ICForeignKey770 = null;
+         var p_QName755 = null;
+         var p_ICCollection756 = null;
+         var p_ICForeignKey757 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2172:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
-            // xquery/XQueryParser.g:2172:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
+            // xquery/XQueryParser.g:2174:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
+            // xquery/XQueryParser.g:2174:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17467); if (this.state.failed) return retval;
+            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53924,7 +53969,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17473); if (this.state.failed) return retval;
+            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17521); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53932,13 +53977,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17477);
-            p_QName768=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17525);
+            p_QName755=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName768.getTree());
-            // xquery/XQueryParser.g:2172:74: ( p_ICCollection | p_ICForeignKey )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName755.getTree());
+            // xquery/XQueryParser.g:2174:74: ( p_ICCollection | p_ICForeignKey )
             var alt260=2;
             var LA260_0 = this.input.LA(1);
 
@@ -53957,24 +54002,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt260) {
                 case 1 :
-                    // xquery/XQueryParser.g:2172:75: p_ICCollection
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17480);
-                    p_ICCollection769=this.p_ICCollection();
+                    // xquery/XQueryParser.g:2174:75: p_ICCollection
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17528);
+                    p_ICCollection756=this.p_ICCollection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection769.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection756.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2172:92: p_ICForeignKey
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17484);
-                    p_ICForeignKey770=this.p_ICForeignKey();
+                    // xquery/XQueryParser.g:2174:92: p_ICForeignKey
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17532);
+                    p_ICForeignKey757=this.p_ICForeignKey();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey770.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey757.getTree());
 
 
                     break;
@@ -54017,7 +54062,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2175:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
+    // xquery/XQueryParser.g:2177:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
     // $ANTLR start "p_ICCollection"
     p_ICCollection: function() {
         var retval = new XQueryParser.p_ICCollection_return();
@@ -54026,19 +54071,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName771 = null;
-         var p_ICCollSequence772 = null;
-         var p_ICCollSequenceUnique773 = null;
-         var p_ICCollNode774 = null;
+         var p_QName758 = null;
+         var p_ICCollSequence759 = null;
+         var p_ICCollSequenceUnique760 = null;
+         var p_ICCollNode761 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2176:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
-            // xquery/XQueryParser.g:2176:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            // xquery/XQueryParser.g:2178:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
+            // xquery/XQueryParser.g:2178:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17512); if (this.state.failed) return retval;
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17560); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54046,7 +54091,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17518); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17566); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54054,13 +54099,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17522);
-            p_QName771=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17570);
+            p_QName758=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName771.getTree());
-            // xquery/XQueryParser.g:2176:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            // xquery/XQueryParser.g:2178:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             var alt261=3;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -54082,35 +54127,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt261) {
                 case 1 :
-                    // xquery/XQueryParser.g:2176:68: p_ICCollSequence
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17525);
-                    p_ICCollSequence772=this.p_ICCollSequence();
+                    // xquery/XQueryParser.g:2178:68: p_ICCollSequence
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17573);
+                    p_ICCollSequence759=this.p_ICCollSequence();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence772.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence759.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2176:87: p_ICCollSequenceUnique
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529);
-                    p_ICCollSequenceUnique773=this.p_ICCollSequenceUnique();
+                    // xquery/XQueryParser.g:2178:87: p_ICCollSequenceUnique
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577);
+                    p_ICCollSequenceUnique760=this.p_ICCollSequenceUnique();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique773.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique760.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2176:112: p_ICCollNode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17533);
-                    p_ICCollNode774=this.p_ICCollNode();
+                    // xquery/XQueryParser.g:2178:112: p_ICCollNode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17581);
+                    p_ICCollNode761=this.p_ICCollNode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode774.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode761.getTree());
 
 
                     break;
@@ -54153,7 +54198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2179:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2181:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollSequence"
     p_ICCollSequence: function() {
         var retval = new XQueryParser.p_ICCollSequence_return();
@@ -54164,22 +54209,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_ExprSingle775 = null;
+         var p_ExprSingle762 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2180:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2180:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2182:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2182:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17561); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17609); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17565);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17613);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54188,7 +54233,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17571); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17619); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54196,12 +54241,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17575);
-            p_ExprSingle775=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17623);
+            p_ExprSingle762=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle775.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle762.getTree());
 
 
 
@@ -54238,7 +54283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2183:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2185:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
     // $ANTLR start "p_ICCollSequenceUnique"
     p_ICCollSequenceUnique: function() {
         var retval = new XQueryParser.p_ICCollSequenceUnique_return();
@@ -54249,17 +54294,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_PathExpr776 = null;
+         var p_PathExpr763 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2184:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2184:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2186:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2186:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17603); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17651); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54267,12 +54312,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17613);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17661);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54281,7 +54326,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17619); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17667); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54289,7 +54334,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625); if (this.state.failed) return retval;
+            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54297,7 +54342,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17631); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17679); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54305,12 +54350,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635);
-            p_PathExpr776=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683);
+            p_PathExpr763=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr776.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
 
 
 
@@ -54347,7 +54392,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2187:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2189:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollNode"
     p_ICCollNode: function() {
         var retval = new XQueryParser.p_ICCollNode_return();
@@ -54358,17 +54403,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_ExprSingle777 = null;
+         var p_ExprSingle764 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2188:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2188:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2190:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2190:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17662); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17710); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54376,7 +54421,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17668); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17716); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54384,12 +54429,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17674); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17722); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17678);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17726);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54398,7 +54443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17684); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17732); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54406,12 +54451,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17688);
-            p_ExprSingle777=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17736);
+            p_ExprSingle764=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle777.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle764.getTree());
 
 
 
@@ -54448,7 +54493,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2191:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
+    // xquery/XQueryParser.g:2193:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
     // $ANTLR start "p_ICForeignKey"
     p_ICForeignKey: function() {
         var retval = new XQueryParser.p_ICForeignKey_return();
@@ -54457,17 +54502,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeySource778 = null;
-         var p_ICForeignKeyTarget779 = null;
+         var p_ICForeignKeySource765 = null;
+         var p_ICForeignKeyTarget766 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2192:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
-            // xquery/XQueryParser.g:2192:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
+            // xquery/XQueryParser.g:2194:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
+            // xquery/XQueryParser.g:2194:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17716); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17764); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54475,7 +54520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17722); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17770); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54483,18 +54528,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726);
-            p_ICForeignKeySource778=this.p_ICForeignKeySource();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774);
+            p_ICForeignKeySource765=this.p_ICForeignKeySource();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource778.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728);
-            p_ICForeignKeyTarget779=this.p_ICForeignKeyTarget();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource765.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776);
+            p_ICForeignKeyTarget766=this.p_ICForeignKeyTarget();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget779.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget766.getTree());
 
 
 
@@ -54531,7 +54576,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2195:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2197:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeySource"
     p_ICForeignKeySource: function() {
         var retval = new XQueryParser.p_ICForeignKeySource_return();
@@ -54540,16 +54585,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues780 = null;
+         var p_ICForeignKeyValues767 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2196:9: (k= FROM p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2196:11: k= FROM p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2198:9: (k= FROM p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2198:11: k= FROM p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17755); if (this.state.failed) return retval;
+            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17803); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54557,12 +54602,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759);
-            p_ICForeignKeyValues780=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807);
+            p_ICForeignKeyValues767=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues780.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues767.getTree());
 
 
 
@@ -54599,7 +54644,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2199:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2201:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeyTarget"
     p_ICForeignKeyTarget: function() {
         var retval = new XQueryParser.p_ICForeignKeyTarget_return();
@@ -54608,16 +54653,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues781 = null;
+         var p_ICForeignKeyValues768 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2200:9: (k= TO p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2200:11: k= TO p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2202:9: (k= TO p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2202:11: k= TO p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17786); if (this.state.failed) return retval;
+            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17834); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54625,12 +54670,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790);
-            p_ICForeignKeyValues781=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838);
+            p_ICForeignKeyValues768=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues781.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues768.getTree());
 
 
 
@@ -54667,7 +54712,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2203:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2205:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
     // $ANTLR start "p_ICForeignKeyValues"
     p_ICForeignKeyValues: function() {
         var retval = new XQueryParser.p_ICForeignKeyValues_return();
@@ -54678,18 +54723,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_QName782 = null;
-         var p_PathExpr783 = null;
+         var p_QName769 = null;
+         var p_PathExpr770 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2204:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2204:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2206:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2206:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54697,13 +54742,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17821);
-            p_QName782=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17869);
+            p_QName769=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName782.getTree());
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17825); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName769.getTree());
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17873); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54711,12 +54756,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17835);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17883);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54725,7 +54770,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17841); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17889); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54733,12 +54778,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845);
-            p_PathExpr783=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893);
+            p_PathExpr770=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr783.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr770.getTree());
 
 
 
@@ -54766,7 +54811,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred1_XQueryParser"
     synpred1_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
+        // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
         var alt262=2;
         var LA262_0 = this.input.LA(1);
 
@@ -54799,9 +54844,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt262) {
             case 1 :
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:13: ( FOR | LET ) DOLLAR
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:13: ( FOR | LET ) DOLLAR
                 if ( this.input.LA(1)==FOR||this.input.LA(1)==LET ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -54820,9 +54865,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:36: FOR ( TUMBLING | SLIDING )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:36: FOR ( TUMBLING | SLIDING )
                 this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_synpred1_XQueryParser3549); if (this.state.failed) return ;
                 if ( this.input.LA(1)==SLIDING||this.input.LA(1)==TUMBLING ) {
                     this.input.consume();
@@ -54846,8 +54891,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred2_XQueryParser"
     synpred2_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:573:11: ( IF LPAREN )
-        // xquery/XQueryParser.g:573:12: IF LPAREN
+        // xquery/XQueryParser.g:575:11: ( IF LPAREN )
+        // xquery/XQueryParser.g:575:12: IF LPAREN
         this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_synpred2_XQueryParser3577); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred2_XQueryParser3579); if (this.state.failed) return ;
 
@@ -54857,8 +54902,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred3_XQueryParser"
     synpred3_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )
-        // xquery/XQueryParser.g:574:12: SWITCH LPAREN
+        // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )
+        // xquery/XQueryParser.g:576:12: SWITCH LPAREN
         this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_synpred3_XQueryParser3607); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred3_XQueryParser3609); if (this.state.failed) return ;
 
@@ -54868,8 +54913,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred4_XQueryParser"
     synpred4_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )
-        // xquery/XQueryParser.g:575:12: TYPESWITCH LPAREN
+        // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )
+        // xquery/XQueryParser.g:577:12: TYPESWITCH LPAREN
         this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_synpred4_XQueryParser3633); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred4_XQueryParser3635); if (this.state.failed) return ;
 
@@ -54879,8 +54924,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred5_XQueryParser"
     synpred5_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )
-        // xquery/XQueryParser.g:576:12: TRY LBRACKET
+        // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )
+        // xquery/XQueryParser.g:578:12: TRY LBRACKET
         this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_synpred5_XQueryParser3655); if (this.state.failed) return ;
         this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred5_XQueryParser3657); if (this.state.failed) return ;
 
@@ -54890,10 +54935,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred6_XQueryParser"
     synpred6_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
-        // xquery/XQueryParser.g:862:12: VALIDATE ( p_ValidationMode | TYPE )?
-        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6185); if (this.state.failed) return ;
-        // xquery/XQueryParser.g:862:21: ( p_ValidationMode | TYPE )?
+        // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
+        // xquery/XQueryParser.g:864:12: VALIDATE ( p_ValidationMode | TYPE )?
+        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6189); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:864:21: ( p_ValidationMode | TYPE )?
         var alt263=3;
         var LA263_0 = this.input.LA(1);
 
@@ -54905,8 +54950,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt263) {
             case 1 :
-                // xquery/XQueryParser.g:862:23: p_ValidationMode
-                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189);
+                // xquery/XQueryParser.g:864:23: p_ValidationMode
+                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193);
                 this.p_ValidationMode();
 
                 this.state._fsp--;
@@ -54915,8 +54960,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:862:42: TYPE
-                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6193); if (this.state.failed) return ;
+                // xquery/XQueryParser.g:864:42: TYPE
+                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6197); if (this.state.failed) return ;
 
 
                 break;
@@ -54930,10 +54975,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred7_XQueryParser"
     synpred7_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )
-        // xquery/XQueryParser.g:907:12: SLASH p_RelativePathExpr
-        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6549); if (this.state.failed) return ;
-        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551);
+        // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )
+        // xquery/XQueryParser.g:909:12: SLASH p_RelativePathExpr
+        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6553); if (this.state.failed) return ;
+        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555);
         this.p_RelativePathExpr();
 
         this.state._fsp--;
@@ -54945,7 +54990,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred8_XQueryParser"
     synpred8_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
+        // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
         // xquery/XQueryParser.g:
         if ( this.input.LA(1)==LPAREN||(this.input.LA(1)>=DOLLAR && this.input.LA(1)<=LBRACKET)||this.input.LA(1)==SMALLER||(this.input.LA(1)>=APOS && this.input.LA(1)<=QUOT) ) {
             this.input.consume();
@@ -54964,7 +55009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred9_XQueryParser"
     synpred9_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
+        // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
         var alt266=3;
         switch ( this.input.LA(1) ) {
         case ATTRIBUTE:
@@ -54990,9 +55035,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         switch (alt266) {
             case 1 :
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
                 if ( this.input.LA(1)==ATTRIBUTE||this.input.LA(1)==ELEMENT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55003,7 +55048,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:922:36: ( p_QName )?
+                // xquery/XQueryParser.g:924:36: ( p_QName )?
                 var alt264=2;
                 var LA264_0 = this.input.LA(1);
 
@@ -55012,8 +55057,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt264) {
                     case 1 :
-                        // xquery/XQueryParser.g:922:36: p_QName
-                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6726);
+                        // xquery/XQueryParser.g:924:36: p_QName
+                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6730);
                         this.p_QName();
 
                         this.state._fsp--;
@@ -55024,7 +55069,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6729); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6733); if (this.state.failed) return ;
 
 
 
@@ -55032,9 +55077,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
                 if ( this.input.LA(1)==NAMESPACE||this.input.LA(1)==PROCESSING_INSTRUCTION ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55045,7 +55090,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:923:51: ( p_NCName )?
+                // xquery/XQueryParser.g:925:51: ( p_NCName )?
                 var alt265=2;
                 var LA265_0 = this.input.LA(1);
 
@@ -55054,8 +55099,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt265) {
                     case 1 :
-                        // xquery/XQueryParser.g:923:51: p_NCName
-                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6755);
+                        // xquery/XQueryParser.g:925:51: p_NCName
+                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6759);
                         this.p_NCName();
 
                         this.state._fsp--;
@@ -55066,7 +55111,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6758); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6762); if (this.state.failed) return ;
 
 
 
@@ -55074,9 +55119,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 3 :
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
                 if ( this.input.LA(1)==COMMENT||this.input.LA(1)==DOCUMENT||this.input.LA(1)==TEXT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55087,7 +55132,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6788); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6792); if (this.state.failed) return ;
 
 
 
@@ -55100,9 +55145,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred10_XQueryParser"
     synpred10_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:926:11: ( p_KindTest )
-        // xquery/XQueryParser.g:926:12: p_KindTest
-        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6818);
+        // xquery/XQueryParser.g:928:11: ( p_KindTest )
+        // xquery/XQueryParser.g:928:12: p_KindTest
+        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6822);
         this.p_KindTest();
 
         this.state._fsp--;
@@ -55114,14 +55159,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred11_XQueryParser"
     synpred11_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )
-        // xquery/XQueryParser.g:927:12: p_QName LPAREN
-        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6837);
+        // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )
+        // xquery/XQueryParser.g:929:12: p_QName LPAREN
+        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6841);
         this.p_QName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6839); if (this.state.failed) return ;
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6843); if (this.state.failed) return ;
 
 
     },
@@ -55129,9 +55174,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred12_XQueryParser"
     synpred12_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )
-        // xquery/XQueryParser.g:928:12: p_PrimaryExpr
-        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857);
+        // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )
+        // xquery/XQueryParser.g:930:12: p_PrimaryExpr
+        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861);
         this.p_PrimaryExpr();
 
         this.state._fsp--;
@@ -55143,9 +55188,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred13_XQueryParser"
     synpred13_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:986:11: ( p_Wildcard )
-        // xquery/XQueryParser.g:986:12: p_Wildcard
-        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296);
+        // xquery/XQueryParser.g:988:11: ( p_Wildcard )
+        // xquery/XQueryParser.g:988:12: p_Wildcard
+        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300);
         this.p_Wildcard();
 
         this.state._fsp--;
@@ -55157,14 +55202,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred14_XQueryParser"
     synpred14_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:987:11: ( p_NCName COLON )
-        // xquery/XQueryParser.g:987:12: p_NCName COLON
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7315);
+        // xquery/XQueryParser.g:989:11: ( p_NCName COLON )
+        // xquery/XQueryParser.g:989:12: p_NCName COLON
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7319);
         this.p_NCName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7317); if (this.state.failed) return ;
+        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7321); if (this.state.failed) return ;
 
 
     },
@@ -55172,9 +55217,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred15_XQueryParser"
     synpred15_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:988:11: ( p_NCName )
-        // xquery/XQueryParser.g:988:12: p_NCName
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7335);
+        // xquery/XQueryParser.g:990:11: ( p_NCName )
+        // xquery/XQueryParser.g:990:12: p_NCName
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7339);
         this.p_NCName();
 
         this.state._fsp--;
@@ -55186,9 +55231,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred16_XQueryParser"
     synpred16_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1025:11: ( LPAREN )
-        // xquery/XQueryParser.g:1025:12: LPAREN
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7591); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:1027:11: ( LPAREN )
+        // xquery/XQueryParser.g:1027:12: LPAREN
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7595); if (this.state.failed) return ;
 
 
     },
@@ -55196,9 +55241,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred17_XQueryParser"
     synpred17_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:1304:27: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602);
+        // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:1306:27: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -55210,9 +55255,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred18_XQueryParser"
     synpred18_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:2136:45: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176);
+        // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:2138:45: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -55493,7 +55538,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA1_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA1_specialS:
-        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
+        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
     DFA1_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -55570,7 +55615,7 @@ XQueryParser.DFA1 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "294:13: (vd= p_VersionDecl )?";
+        return "296:13: (vd= p_VersionDecl )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55578,6 +55623,25 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA1_1 = input.LA(1);
+
+                             
+                            var index1_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
+
+                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA1_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index1_1);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA1_0 = input.LA(1);
 
                              
@@ -55598,25 +55662,6 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
                             input.seek(index1_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA1_1 = input.LA(1);
-
-                             
-                            var index1_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
-
-                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA1_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index1_1);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -55642,7 +55687,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA2_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA2_specialS:
-        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
+        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
     DFA2_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -55719,7 +55764,7 @@ XQueryParser.DFA2 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
+        return "297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55727,25 +55772,6 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA2_1 = input.LA(1);
-
-                             
-                            var index2_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
-
-                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA2_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index2_1);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
                             var LA2_0 = input.LA(1);
 
                              
@@ -55766,6 +55792,25 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
                             input.seek(index2_0);
                             if ( s>=0 ) return s;
                             break;
+                        case 1 : 
+                            var LA2_1 = input.LA(1);
+
+                             
+                            var index2_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
+
+                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA2_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index2_1);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -55792,7 +55837,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0002\uffff\u0002\u0002\u0001\uffff\u0001\u0002\u0002\u0001\u0002"+
     "\u0002",
     DFA6_specialS:
-        "\u0001\u0001\u0001\u0000\u0002\uffff\u0001\u0002\u0005\uffff}>",
+        "\u0001\u0002\u0001\u0000\u0002\uffff\u0001\u0001\u0005\uffff}>",
     DFA6_transitionS: [
             "\u0002\u0002\u0004\u0005\u0001\u0002\u0006\u0005\u0001\u0002"+
             "\u0001\u0005\u0001\u0002\u0002\u0005\u0001\u0001\u0001\u0005"+
@@ -55883,7 +55928,7 @@ XQueryParser.DFA6 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "()* loopback of 330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
+        return "()* loopback of 332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55912,6 +55957,23 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             if ( s>=0 ) return s;
                             break;
                         case 1 : 
+                            var LA6_4 = input.LA(1);
+
+                             
+                            var index6_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
+
+                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
+
+                             
+                            input.seek(index6_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
                             var LA6_0 = input.LA(1);
 
                              
@@ -55932,23 +55994,6 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             input.seek(index6_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA6_4 = input.LA(1);
-
-                             
-                            var index6_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
-
-                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
-
-                             
-                            input.seek(index6_4);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -56032,7 +56077,7 @@ XQueryParser.DFA9 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA9, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
+        return "358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -56239,7 +56284,7 @@ XQueryParser.DFA44 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
+        return "537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57137,7 +57182,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_50 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57272,7 +57317,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_59 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57287,7 +57332,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_60 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57302,7 +57347,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_61 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57317,7 +57362,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_62 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57441,8 +57486,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0007\uffff\u0001\u0006\u0005\u0001\u0001\u0002\u0001\u0003\u0001"+
     "\u0004\u0001\u0005",
     DFA46_specialS:
-        "\u0001\uffff\u0001\u0003\u0001\u0000\u0001\u0005\u0001\u0002\u0001"+
-    "\u0004\u0001\u0001\u000a\uffff}>",
+        "\u0001\uffff\u0001\u0005\u0001\u0003\u0001\u0002\u0001\u0000\u0001"+
+    "\u0001\u0001\u0004\u000a\uffff}>",
     DFA46_transitionS: [
             "\u0025\u0007\u0001\u0001\u0005\u0007\u0001\u0003\u000a\u0007"+
             "\u0001\u0002\u0021\u0007\u0001\u0005\u001d\u0007\u0001\u0004"+
@@ -57593,7 +57638,7 @@ XQueryParser.DFA46 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
+        return "573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57601,6 +57646,51 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA46_4 = input.LA(1);
+
+                             
+                            var index46_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
+
+                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
+                            var LA46_5 = input.LA(1);
+
+                             
+                            var index46_5 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
+
+                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_5);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
+                            var LA46_3 = input.LA(1);
+
+                             
+                            var index46_3 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
+
+                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_3);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
                             var LA46_2 = input.LA(1);
 
                              
@@ -57617,7 +57707,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_2);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
+                        case 4 : 
                             var LA46_6 = input.LA(1);
 
                              
@@ -57632,22 +57722,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_6);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA46_4 = input.LA(1);
-
-                             
-                            var index46_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
-
-                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 3 : 
+                        case 5 : 
                             var LA46_1 = input.LA(1);
 
                              
@@ -57666,36 +57741,6 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_1);
                             if ( s>=0 ) return s;
                             break;
-                        case 4 : 
-                            var LA46_5 = input.LA(1);
-
-                             
-                            var index46_5 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
-
-                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_5);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 5 : 
-                            var LA46_3 = input.LA(1);
-
-                             
-                            var index46_3 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
-
-                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_3);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -57818,7 +57863,7 @@ XQueryParser.DFA117 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA117, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
+        return "908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57983,7 +58028,7 @@ XQueryParser.DFA119 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
+        return "921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -58396,13 +58441,13 @@ org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
                             s = -1;
                             if ( ((this.synpred8_XQueryParser()||(this.synpred8_XQueryParser()&&(this.lc(MLS))))) ) {s = 45;}
 
-                            else if ( (((this.synpred9_XQueryParser()&&(this.lc(MLS)))||this.synpred9_XQueryParser())) ) {s = 46;}
+                            else if ( ((this.synpred9_XQueryParser()||(this.synpred9_XQueryParser()&&(this.lc(MLS))))) ) {s = 46;}
 
                             else if ( (this.synpred10_XQueryParser()) ) {s = 49;}
 
-                            else if ( (((this.synpred11_XQueryParser()&&(this.lc(MLS)))||this.synpred11_XQueryParser())) ) {s = 47;}
+                            else if ( ((this.synpred11_XQueryParser()||(this.synpred11_XQueryParser()&&(this.lc(MLS))))) ) {s = 47;}
 
-                            else if ( ((this.synpred12_XQueryParser()||(this.synpred12_XQueryParser()&&(this.lc(MLS))))) ) {s = 48;}
+                            else if ( (((this.synpred12_XQueryParser()&&(this.lc(MLS)))||this.synpred12_XQueryParser())) ) {s = 48;}
 
                             else if ( (true) ) {s = 50;}
 
@@ -59128,7 +59173,7 @@ XQueryParser.DFA121 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA121, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
+        return "940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
     },
     dummy: null
 });
@@ -59365,7 +59410,7 @@ XQueryParser.DFA126 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA126, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "980:1: p_NodeTest : ( p_KindTest | p_NameTest );";
+        return "982:1: p_NodeTest : ( p_KindTest | p_NameTest );";
     },
     dummy: null
 });
@@ -59386,7 +59431,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     "\uffff\u0001\u0005\u0002\uffff\u0001\u0008\u0006\uffff\u0001\u0009\u0001"+
     "\u0006\u0001\u0007\u0002\u0008",
     DFA134_specialS:
-        "\u0001\u0000\u000d\uffff\u0001\u0001\u0007\uffff}>",
+        "\u0001\u0001\u000d\uffff\u0001\u0000\u0007\uffff}>",
     DFA134_transitionS: [
             "\u0006\u0007\u0001\u000c\u0008\u0007\u0001\u000f\u0008\u0007"+
             "\u0001\u0009\u0001\u0007\u0001\u0006\u001f\u0007\u0001\u000b"+
@@ -59466,7 +59511,7 @@ XQueryParser.DFA134 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
+        return "1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -59474,6 +59519,21 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA134_14 = input.LA(1);
+
+                             
+                            var index134_14 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
+
+                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
+
+                             
+                            input.seek(index134_14);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA134_0 = input.LA(1);
 
                              
@@ -59518,21 +59578,6 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
                             input.seek(index134_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA134_14 = input.LA(1);
-
-                             
-                            var index134_14 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
-
-                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
-
-                             
-                            input.seek(index134_14);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -59692,7 +59737,7 @@ XQueryParser.DFA162 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA162, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
+        return "1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60045,7 +60090,7 @@ XQueryParser.DFA164 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA164, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
+        return "1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60149,7 +60194,7 @@ XQueryParser.DFA218 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA218, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
+        return "1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
     },
     dummy: null
 });
@@ -60290,7 +60335,7 @@ XQueryParser.DFA237 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA237, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
+        return "1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
     },
     dummy: null
 });
@@ -60306,8 +60351,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA253_acceptS:
         "\u0003\uffff\u0001\u0002\u0005\uffff\u0001\u0001\u0001\u0003",
     DFA253_specialS:
-        "\u0004\uffff\u0001\u0000\u0001\u0004\u0001\u0003\u0001\u0002\u0001"+
-    "\u0001\u0002\uffff}>",
+        "\u0004\uffff\u0001\u0002\u0001\u0001\u0001\u0004\u0001\u0000\u0001"+
+    "\u0003\u0002\uffff}>",
     DFA253_transitionS: [
             "\u0020\u0003\u0001\u0002\u002f\u0003\u0001\u0001\u002e\u0003"+
             "\u0001\u0008\u0001\u0005\u0001\u0003\u0001\u0004\u0004\u0003"+
@@ -60468,7 +60513,7 @@ XQueryParser.DFA253 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
+        return "2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60476,36 +60521,6 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA253_4 = input.LA(1);
-
-                             
-                            var index253_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
-
-                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
-
-                             
-                            input.seek(index253_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
-                            var LA253_8 = input.LA(1);
-
-                             
-                            var index253_8 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_8);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 2 : 
                             var LA253_7 = input.LA(1);
 
                              
@@ -60520,22 +60535,7 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_7);
                             if ( s>=0 ) return s;
                             break;
-                        case 3 : 
-                            var LA253_6 = input.LA(1);
-
-                             
-                            var index253_6 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_6);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 4 : 
+                        case 1 : 
                             var LA253_5 = input.LA(1);
 
                              
@@ -60550,6 +60550,51 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_5);
                             if ( s>=0 ) return s;
                             break;
+                        case 2 : 
+                            var LA253_4 = input.LA(1);
+
+                             
+                            var index253_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
+
+                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
+
+                             
+                            input.seek(index253_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
+                            var LA253_8 = input.LA(1);
+
+                             
+                            var index253_8 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_8);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 4 : 
+                            var LA253_6 = input.LA(1);
+
+                             
+                            var index253_6 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_6);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -60797,1025 +60842,1025 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_p_OrderByClause_in_p_IntermediateClause3786: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_CountClause_in_p_IntermediateClause3790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_CONCAT_in_p_StringConcatExpr3815: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_FOR_in_p_ForClause3844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ForClause3851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3853: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_ForBinding3883: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_TypeDeclaration_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_AllowingEmpty_in_p_ForBinding3894: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_PositionalVar_in_p_ForBinding3897: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_FTScoreVar_in_p_ForBinding3900: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_ForBinding3905: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALLOWING_in_p_AllowingEmpty3938: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
-    FOLLOW_EMPTY_in_p_AllowingEmpty3944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_PositionalVar3974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_PositionalVar3980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LET_in_p_LetClause4014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_LetClause4021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4023: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_LetBinding4057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_TypeDeclaration_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_FTScoreVar_in_p_LetBinding4071: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_LetBinding4077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOR_in_p_WindowClause4106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
-    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TUMBLING_in_p_TumblingWindowClause4152: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_TumblingWindowClause4158: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TumblingWindowClause4164: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_TumblingWindowClause4177: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLIDING_in_p_SlidingWindowClause4215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_SlidingWindowClause4221: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_SlidingWindowClause4227: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_SlidingWindowClause4240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_START_in_p_WindowStartCondition4278: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ONLY_in_p_WindowEndCondition4320: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_WindowEndCondition4328: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4370: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CurrentItem_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_p_PositionalVar_in_p_WindowVars4380: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_PREVIOUS_in_p_WindowVars4386: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PreviousItem_in_p_WindowVars4392: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_NEXT_in_p_WindowVars4399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NextItem_in_p_WindowVars4405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_CurrentItem4433: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_PreviousItem4459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NextItem4485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COUNT_in_p_CountClause4513: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CountClause4519: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CountClause4523: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHERE_in_p_WhereClause4561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GROUP_in_p_GroupByClause4594: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_GroupByClause4600: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_GroupingSpecList4633: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_GroupingSpec4665: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_GroupingSpec4676: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4712: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_STABLE_in_p_OrderByClause4724: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpecList_in_p_OrderByClause4738: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_OrderSpecList4767: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_ExprSingle_in_p_OrderSpec4797: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
-    FOLLOW_p_OrderModifier_in_p_OrderSpec4800: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ASCENDING_in_p_OrderModifier4829: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_DESCENDING_in_p_OrderModifier4835: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_EMPTY_in_p_OrderModifier4842: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
-    FOLLOW_GREATEST_in_p_OrderModifier4847: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_LEAST_in_p_OrderModifier4853: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_OrderModifier4861: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_OrderModifier4863: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnHybrid4896: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SOME_in_p_QuantifiedExpr4930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_EVERY_in_p_QuantifiedExpr4936: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4956: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4981: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_SATISFIES_in_p_QuantifiedExpr4992: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchHybrid5026: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchHybrid5032: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchHybrid5035: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchHybrid5043: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchHybrid5049: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseHybrid5084: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseHybrid5094: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchHybrid5161: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchHybrid5164: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchHybrid5191: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseHybrid5225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseHybrid5232: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseHybrid5242: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_SequenceTypeUnion5286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_IF_in_p_IfHybrid5319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfHybrid5325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfHybrid5328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfHybrid5341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TryClause_in_p_TryCatchExpr5372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_p_CatchClause_in_p_TryCatchExpr5374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryClause5403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_TryClause5407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TryTargetExpr_in_p_TryClause5409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TryTargetExpr5437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CATCH_in_p_CatchClause5466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CatchClause5472: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CatchClause5477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5503: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_CatchErrorList5506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5508: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_OR_in_p_OrExpr5559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5592: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_AND_in_p_AndExpr5598: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
-    FOLLOW_p_ValueComp_in_p_ComparisonExpr5637: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_RangeExpr5683: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_PLUS_in_p_AdditiveExpr5723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_AdditiveExpr5731: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_MultiplicativeExpr5772: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DIV_in_p_MultiplicativeExpr5781: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_IDIV_in_p_MultiplicativeExpr5787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MOD_in_p_MultiplicativeExpr5793: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_UNION_in_p_UnionExpr5835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_VBAR_in_p_UnionExpr5841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
-    FOLLOW_INSTANCE_in_p_InstanceofExpr5926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_InstanceofExpr5932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastableExpr_in_p_TreatExpr5964: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_TREAT_in_p_TreatExpr5970: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TreatExpr5976: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastExpr_in_p_CastableExpr6017: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
-    FOLLOW_CASTABLE_in_p_CastableExpr6023: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastableExpr6029: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnaryExpr_in_p_CastExpr6070: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
-    FOLLOW_CAST_in_p_CastExpr6076: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastExpr6082: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PLUS_in_p_UnaryExpr6118: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_UnaryExpr6126: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ValueExpr_in_p_UnaryExpr6131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ValidateExpr_in_p_ValueExpr6201: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ValueExpr6213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQUAL_in_p_GeneralComp6254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NOTEQUAL_in_p_GeneralComp6260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_GeneralComp6266: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLEREQ_in_p_GeneralComp6272: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_GeneralComp6278: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATEREQ_in_p_GeneralComp6284: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQ_in_p_ValueComp6316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NE_in_p_ValueComp6322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LT_in_p_ValueComp6328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LE_in_p_ValueComp6334: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GT_in_p_ValueComp6340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GE_in_p_ValueComp6346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IS_in_p_NodeComp6377: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_GREATER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_p_ValidateExpr6415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_ValidationMode_in_p_ValidateExpr6421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_TYPE_in_p_ValidateExpr6427: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_ValidateExpr6436: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ValidateExpr6438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ValidateExpr6441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LAX_in_p_ValidationMode6470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STRICT_in_p_ValidationMode6476: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_ExtensionExpr6505: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_ExtensionExpr6508: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ExtensionExpr6510: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6557: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6559: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6572: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_SLASH_in_p_PathExpr6584: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6586: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6626: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_set_in_p_RelativePathExpr6629: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6637: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6823: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6862: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseStep_in_p_AxisStep6901: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_ForwardStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_PredicateList_in_p_AxisStep6908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ForwardAxis_in_p_ForwardStep6934: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ForwardStep6936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CHILD_in_p_ForwardAxis6974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6976: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_in_p_ForwardAxis6988: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SELF_in_p_ForwardAxis7016: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7046: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_in_p_ForwardAxis7058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7060: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseAxis_in_p_ReverseStep7115: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ReverseStep7117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARENT_in_p_ReverseAxis7155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_in_p_ReverseAxis7169: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_in_p_ReverseAxis7197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_NodeTest7265: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_p_NameTest7301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_Wildcard7370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7373: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7389: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Wildcard7405: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_Predicate_in_p_PostfixExpr7450: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LPAREN_in_p_ArgumentList7491: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ArgumentList7497: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7499: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_ArgumentList7505: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Predicate_in_p_PredicateList7531: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LSQUARE_in_p_Predicate7558: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_Predicate7560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
-    FOLLOW_RSQUARE_in_p_Predicate7563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Literal_in_p_PrimaryExpr7608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarRef_in_p_PrimaryExpr7620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Constructor_in_p_PrimaryExpr7680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NumericLiteral_in_p_Literal7720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarRef7806: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarRef7810: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_VarName7838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedExpr7864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ParenthesizedExpr7866: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_in_p_ContextItemExpr7896: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_OrderedExpr7924: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_OrderedExpr7930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_OrderedExpr7933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNORDERED_in_p_UnorderedExpr7961: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_UnorderedExpr7967: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_UnorderedExpr7970: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_FQName_in_p_FunctionCall7999: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_ArgumentList_in_p_FunctionCall8004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_Argument8030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_p_Constructor8087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ComputedConstructor_in_p_Constructor8099: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_DirElemConstructor8176: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
-    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
-    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8216: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8232: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8309: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirAttributeList8314: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_EQUAL_in_p_DirAttributeList8321: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8360: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8367: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8414: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8421: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CDataSection_in_pm_DirElemContent8553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_pm_DirElemContent8565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CharRef_in_pm_CommonContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CDataSection_in_p_CDataSection8817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompDocConstructor8969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompDocConstructor8973: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_pm_CompElemConstructor9009: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompElemConstructor9014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9019: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompElemConstructor9021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9024: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9028: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompAttrConstructor9093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompAttrConstructor9100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Prefix9188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_PrefixExpr9214: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_URIExpr9241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_CompTextConstructor9270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompTextConstructor9274: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompTextConstructor9276: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompTextConstructor9279: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_CompBinaryConstructor9307: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompBinaryConstructor9313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_pm_CompCommentConstructor9345: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pm_CompPIConstructor9387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9392: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompPIConstructor9394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9401: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_SingleType9451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_TypeDeclaration9480: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypeDeclaration9486: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SequenceType9545: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SequenceType9549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_SequenceType9598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONCAT_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_FOR_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3852: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ForClause3855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_TypeDeclaration_in_p_ForBinding3895: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_AllowingEmpty_in_p_ForBinding3898: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_PositionalVar_in_p_ForBinding3901: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_FTScoreVar_in_p_ForBinding3904: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ForBinding3913: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALLOWING_in_p_AllowingEmpty3942: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
+    FOLLOW_EMPTY_in_p_AllowingEmpty3948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_PositionalVar3978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_PositionalVar3988: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LET_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_LetClause4025: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_TypeDeclaration_in_p_LetBinding4069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_FTScoreVar_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_LetBinding4079: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_LetBinding4081: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOR_in_p_WindowClause4110: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
+    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TUMBLING_in_p_TumblingWindowClause4156: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_TumblingWindowClause4162: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLIDING_in_p_SlidingWindowClause4219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_SlidingWindowClause4225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_START_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ONLY_in_p_WindowEndCondition4324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CurrentItem_in_p_WindowVars4378: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_p_PositionalVar_in_p_WindowVars4384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_PREVIOUS_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4394: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PreviousItem_in_p_WindowVars4396: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_NEXT_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NextItem_in_p_WindowVars4409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_CurrentItem4437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_PreviousItem4463: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NextItem4489: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COUNT_in_p_CountClause4517: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CountClause4523: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CountClause4527: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHERE_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WhereClause4569: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GROUP_in_p_GroupByClause4598: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_GroupingSpecList4637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_GroupingSpec4673: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_GroupingSpec4684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4720: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_STABLE_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4736: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpecList_in_p_OrderByClause4742: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_OrderSpecList4771: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4773: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_ExprSingle_in_p_OrderSpec4801: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
+    FOLLOW_p_OrderModifier_in_p_OrderSpec4804: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ASCENDING_in_p_OrderModifier4833: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_DESCENDING_in_p_OrderModifier4839: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_EMPTY_in_p_OrderModifier4846: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
+    FOLLOW_GREATEST_in_p_OrderModifier4851: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_LEAST_in_p_OrderModifier4857: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_OrderModifier4865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_OrderModifier4867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnHybrid4904: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SOME_in_p_QuantifiedExpr4934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_EVERY_in_p_QuantifiedExpr4940: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_SATISFIES_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchHybrid5034: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchHybrid5036: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchHybrid5039: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchHybrid5047: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchHybrid5057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchHybrid5163: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchHybrid5165: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchHybrid5168: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchHybrid5187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseHybrid5229: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseHybrid5240: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseHybrid5246: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_CaseHybrid5260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_SequenceTypeUnion5290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_IF_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfHybrid5327: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfHybrid5329: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5340: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5349: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TryClause_in_p_TryCatchExpr5376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_p_CatchClause_in_p_TryCatchExpr5378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryClause5407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TryTargetExpr_in_p_TryClause5413: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_TryClause5415: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TryTargetExpr5441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CATCH_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CatchClause5476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CatchClause5478: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CatchClause5481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5507: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_CatchErrorList5510: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5512: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_OR_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5596: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_AND_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5606: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
+    FOLLOW_p_ValueComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeComp_in_p_ComparisonExpr5649: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_PLUS_in_p_AdditiveExpr5727: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_AdditiveExpr5735: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_MultiplicativeExpr5776: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DIV_in_p_MultiplicativeExpr5785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_IDIV_in_p_MultiplicativeExpr5791: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MOD_in_p_MultiplicativeExpr5797: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_UNION_in_p_UnionExpr5839: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_VBAR_in_p_UnionExpr5845: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
+    FOLLOW_INSTANCE_in_p_InstanceofExpr5930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_InstanceofExpr5940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastableExpr_in_p_TreatExpr5968: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_TREAT_in_p_TreatExpr5974: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TreatExpr5984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastExpr_in_p_CastableExpr6021: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
+    FOLLOW_CASTABLE_in_p_CastableExpr6027: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastableExpr6037: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnaryExpr_in_p_CastExpr6074: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
+    FOLLOW_CAST_in_p_CastExpr6080: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastExpr6090: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PLUS_in_p_UnaryExpr6122: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_UnaryExpr6130: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ValueExpr_in_p_UnaryExpr6135: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ValidateExpr_in_p_ValueExpr6205: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ValueExpr6217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQUAL_in_p_GeneralComp6258: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NOTEQUAL_in_p_GeneralComp6264: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_GeneralComp6270: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLEREQ_in_p_GeneralComp6276: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_GeneralComp6282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATEREQ_in_p_GeneralComp6288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQ_in_p_ValueComp6320: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NE_in_p_ValueComp6326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LT_in_p_ValueComp6332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LE_in_p_ValueComp6338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GT_in_p_ValueComp6344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GE_in_p_ValueComp6350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IS_in_p_NodeComp6381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_GREATER_in_p_NodeComp6391: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_VALIDATE_in_p_ValidateExpr6419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_ValidationMode_in_p_ValidateExpr6425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_TYPE_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ValidateExpr6435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_ValidateExpr6440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ValidateExpr6442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ValidateExpr6445: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LAX_in_p_ValidationMode6474: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STRICT_in_p_ValidationMode6480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_ExtensionExpr6509: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_ExtensionExpr6512: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ExtensionExpr6518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_SLASH_in_p_PathExpr6588: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6590: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_set_in_p_RelativePathExpr6633: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6695: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6809: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6827: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6866: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6878: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_ForwardStep_in_p_AxisStep6909: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_PredicateList_in_p_AxisStep6912: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ForwardAxis_in_p_ForwardStep6938: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ForwardStep6940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CHILD_in_p_ForwardAxis6978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_in_p_ForwardAxis6992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SELF_in_p_ForwardAxis7020: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7036: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7050: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_in_p_ForwardAxis7062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7064: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseAxis_in_p_ReverseStep7119: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ReverseStep7121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARENT_in_p_ReverseAxis7159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_in_p_ReverseAxis7173: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7175: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_in_p_ReverseAxis7201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7203: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_NodeTest7273: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_p_NameTest7305: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_Wildcard7374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7379: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7395: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7397: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7411: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7413: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_Predicate_in_p_PostfixExpr7454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LPAREN_in_p_ArgumentList7495: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7498: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ArgumentList7501: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7503: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_ArgumentList7509: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Predicate_in_p_PredicateList7535: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LSQUARE_in_p_Predicate7562: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_Predicate7564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
+    FOLLOW_RSQUARE_in_p_Predicate7567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Literal_in_p_PrimaryExpr7612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarRef_in_p_PrimaryExpr7624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Constructor_in_p_PrimaryExpr7684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NumericLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Literal7728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarRef7810: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarRef7814: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_VarName7842: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedExpr7868: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedExpr7874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_in_p_ContextItemExpr7900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_OrderedExpr7932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_OrderedExpr7934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_OrderedExpr7937: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNORDERED_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_UnorderedExpr7969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_UnorderedExpr7971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_UnorderedExpr7974: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_FQName_in_p_FunctionCall8003: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_ArgumentList_in_p_FunctionCall8008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_Argument8034: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_p_Constructor8091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ComputedConstructor_in_p_Constructor8103: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_DirElemConstructor8180: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
+    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
+    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8220: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirElemConstructor8233: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8313: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_EQUAL_in_p_DirAttributeList8325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8327: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8366: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8379: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8389: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8434: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8447: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CDataSection_in_pm_DirElemContent8593: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_pm_DirElemContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CharRef_in_pm_CommonContent8657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CDataSection_in_p_CDataSection8865: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompDocConstructor9017: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompDocConstructor9021: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_pm_CompElemConstructor9057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompElemConstructor9062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9067: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompElemConstructor9069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9072: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9076: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompAttrConstructor9141: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompAttrConstructor9148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Prefix9236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_PrefixExpr9262: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_URIExpr9289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_CompTextConstructor9318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompTextConstructor9322: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompTextConstructor9324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompTextConstructor9327: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_CompBinaryConstructor9355: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompBinaryConstructor9361: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_pm_CompCommentConstructor9393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pm_CompPIConstructor9435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompPIConstructor9442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9449: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9453: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_SingleType9499: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_TypeDeclaration9528: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypeDeclaration9534: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SequenceType9593: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SequenceType9597: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_SequenceType9646: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_OccurrenceIndicator0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_ItemType9711: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_ItemType9751: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9753: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9755: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ITEM_in_p_ItemType9797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicOrUnionType9883: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DocumentTest_in_p_KindTest9933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_KindTest9945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeTest_in_p_KindTest9957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_KindTest9969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PITest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CommentTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TextTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AnyKindTest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_AnyKindTest10067: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyKindTest10069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyKindTest10071: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_DocumentTest10099: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_DocumentTest10102: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_DocumentTest10110: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_TextTest10136: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TextTest10138: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TextTest10140: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_p_CommentTest10166: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_CommentTest10168: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_CommentTest10170: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_NamespaceNodeTest10198: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_NamespaceNodeTest10200: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_PITest10228: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_PITest10231: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_PITest10235: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_PITest10239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_AttributeTest10265: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AttributeTest10267: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_AttributeTest10273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_AttributeTest10275: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AttributeTest10281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_AttribNameOrWildcard10313: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaAttributeTest10341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaAttributeTest10345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_p_ElementTest10397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ElementTest10399: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ElementTest10405: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ElementTest10407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_ElementTest10409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ElementTest10416: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementNameOrWildcard10442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_ElementNameOrWildcard10446: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaElementTest10466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaElementTest10470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementName_in_p_ElementDeclaration10496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AttributeName10522: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementName10548: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_TypeName10574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_FunctionTest10600: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_AnyFunctionTest10635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyFunctionTest10637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_AnyFunctionTest10639: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyFunctionTest10641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_TypedFunctionTest10667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypedFunctionTest10669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TypedFunctionTest10675: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_TypedFunctionTest10683: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TypedFunctionTest10685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedItemType10713: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedItemType10717: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10768: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10774: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10813: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10819: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_pg_QuotStringLiteralContent10885: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_set_in_pg_AposStringLiteralContent10936: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_p_QName11156: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_QName11168: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_pg_FQName11229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FNCName_in_pg_FQName11241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11285: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_pg_QName11287: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11291: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_ItemType9759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9803: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ITEM_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9847: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicOrUnionType9931: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DocumentTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PITest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CommentTest_in_p_KindTest10053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TextTest_in_p_KindTest10065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AnyKindTest_in_p_KindTest10089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_AnyKindTest10115: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyKindTest10117: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyKindTest10119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_DocumentTest10147: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_DocumentTest10150: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_DocumentTest10158: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_TextTest10184: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TextTest10186: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TextTest10188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_p_CommentTest10214: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_CommentTest10216: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_CommentTest10218: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_NamespaceNodeTest10246: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_NamespaceNodeTest10248: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_PITest10276: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_PITest10279: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_PITest10283: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_PITest10287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_AttributeTest10313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AttributeTest10315: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_AttributeTest10321: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_AttributeTest10323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AttributeTest10329: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_AttribNameOrWildcard10361: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaAttributeTest10389: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaAttributeTest10393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_p_ElementTest10445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ElementTest10447: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ElementTest10453: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ElementTest10455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_ElementTest10457: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ElementTest10464: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementNameOrWildcard10490: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_ElementNameOrWildcard10494: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaElementTest10514: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaElementTest10518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementName_in_p_ElementDeclaration10544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AttributeName10570: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementName10596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_TypeName10622: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_FunctionTest10648: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_AnyFunctionTest10683: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyFunctionTest10685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_AnyFunctionTest10687: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyFunctionTest10689: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_TypedFunctionTest10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypedFunctionTest10717: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TypedFunctionTest10723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_TypedFunctionTest10731: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TypedFunctionTest10733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedItemType10761: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedItemType10765: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10816: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10861: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_pg_QuotStringLiteralContent10933: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_set_in_pg_AposStringLiteralContent10984: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_p_QName11204: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_QName11216: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_pg_FQName11277: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FNCName_in_pg_FQName11289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11333: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_pg_QName11335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_NCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_FNCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_RevalidationDecl13358: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
-    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
-    FOLLOW_STRICT_in_pm_RevalidationDecl13367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_LAX_in_pm_RevalidationDecl13373: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SKIP_in_pm_RevalidationDecl13379: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_InsertExprTargetChoice13414: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
-    FOLLOW_FIRST_in_p_InsertExprTargetChoice13419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_LAST_in_p_InsertExprTargetChoice13425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_INTO_in_p_InsertExprTargetChoice13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AFTER_in_p_InsertExprTargetChoice13449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INSERT_in_p_InsertExpr13495: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_InsertExpr13500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_InsertExpr13506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SourceExpr_in_p_InsertExpr13509: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
-    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_InsertExpr13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DELETE_in_p_DeleteExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_DeleteExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_DeleteExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_DeleteExpr13557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_REPLACE_in_p_ReplaceExpr13587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_VALUE_in_p_ReplaceExpr13592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_ReplaceExpr13596: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ReplaceExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_WITH_in_p_ReplaceExpr13609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RENAME_in_p_RenameExpr13642: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_RenameExpr13646: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_RenameExpr13648: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_RenameExpr13652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NewNameExpr_in_p_RenameExpr13654: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SourceExpr13682: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TargetExpr13709: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_NewNameExpr13736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COPY_in_p_TransformExpr13765: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13769: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13773: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13777: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13779: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TransformExpr13783: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13791: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13795: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_MODIFY_in_p_TransformExpr13804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13806: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TransformExpr13811: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_FTOptionDecl13851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
-    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCORE_in_p_FTScoreVar13889: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_FTScoreVar13895: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_FTScoreVar13899: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_CONTAINS_in_p_FTContainsExpr13933: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_TEXT_in_p_FTContainsExpr13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTContainsExpr13941: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOr_in_p_FTSelection13973: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_p_FTPosFilter_in_p_FTSelection13975: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_WEIGHT_in_p_FTWeight14004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_FTWeight14008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWeight14010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWeight14013: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_FTOR_in_p_FTOr14045: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14049: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_FTAND_in_p_FTAnd14084: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14088: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_NOT_in_p_FTMildNot14123: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_FTMildNot14127: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_FTNOT_in_p_FTUnaryNot14164: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
-    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWords_in_p_FTPrimary14233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
-    FOLLOW_p_FTTimes_in_p_FTPrimary14235: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTPrimary14250: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTPrimary14252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_FTPrimary14254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWordsValue_in_p_FTWords14293: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
-    FOLLOW_p_FTAnyallOption_in_p_FTWords14295: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTWordsValue14322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTWordsValue14335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWordsValue14337: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWordsValue14340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_FTExtensionSelection14367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTExtensionSelection14370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTExtensionSelection14375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANY_in_p_FTAnyallOption14406: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
-    FOLLOW_WORD_in_p_FTAnyallOption14410: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALL_in_p_FTAnyallOption14419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTAnyallOption14421: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PHRASE_in_p_FTAnyallOption14429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OCCURS_in_p_FTTimes14461: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTTimes14463: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
-    FOLLOW_TIMES_in_p_FTTimes14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTRange14500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14520: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTRange14524: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14526: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14544: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_RevalidationDecl13406: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
+    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
+    FOLLOW_STRICT_in_pm_RevalidationDecl13415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_LAX_in_pm_RevalidationDecl13421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SKIP_in_pm_RevalidationDecl13427: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_InsertExprTargetChoice13462: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
+    FOLLOW_FIRST_in_p_InsertExprTargetChoice13467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_LAST_in_p_InsertExprTargetChoice13473: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_INTO_in_p_InsertExprTargetChoice13480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AFTER_in_p_InsertExprTargetChoice13497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INSERT_in_p_InsertExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_InsertExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_InsertExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SourceExpr_in_p_InsertExpr13557: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
+    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_InsertExpr13561: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DELETE_in_p_DeleteExpr13591: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_DeleteExpr13596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_DeleteExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_DeleteExpr13605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_REPLACE_in_p_ReplaceExpr13635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_VALUE_in_p_ReplaceExpr13640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_ReplaceExpr13644: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ReplaceExpr13650: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_WITH_in_p_ReplaceExpr13657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RENAME_in_p_RenameExpr13690: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_RenameExpr13694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_RenameExpr13696: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_RenameExpr13700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NewNameExpr_in_p_RenameExpr13702: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SourceExpr13730: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TargetExpr13757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_NewNameExpr13784: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COPY_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13825: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13827: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TransformExpr13831: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13839: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13843: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_MODIFY_in_p_TransformExpr13852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13854: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TransformExpr13859: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_FTOptionDecl13899: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
+    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCORE_in_p_FTScoreVar13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_FTScoreVar13943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_FTScoreVar13947: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_CONTAINS_in_p_FTContainsExpr13981: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_TEXT_in_p_FTContainsExpr13985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTContainsExpr13989: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOr_in_p_FTSelection14021: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_p_FTPosFilter_in_p_FTSelection14023: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_WEIGHT_in_p_FTWeight14052: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_FTWeight14056: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWeight14058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWeight14061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_FTOR_in_p_FTOr14093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14126: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_FTAND_in_p_FTAnd14132: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14136: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_NOT_in_p_FTMildNot14171: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_FTMildNot14175: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_FTNOT_in_p_FTUnaryNot14212: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
+    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWords_in_p_FTPrimary14281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
+    FOLLOW_p_FTTimes_in_p_FTPrimary14283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTPrimary14298: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTPrimary14300: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_FTPrimary14302: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWordsValue_in_p_FTWords14341: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
+    FOLLOW_p_FTAnyallOption_in_p_FTWords14343: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTWordsValue14370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTWordsValue14383: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWordsValue14385: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWordsValue14388: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_FTExtensionSelection14415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTExtensionSelection14418: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTExtensionSelection14423: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANY_in_p_FTAnyallOption14454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
+    FOLLOW_WORD_in_p_FTAnyallOption14458: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALL_in_p_FTAnyallOption14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTAnyallOption14469: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PHRASE_in_p_FTAnyallOption14477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OCCURS_in_p_FTTimes14509: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTTimes14511: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
+    FOLLOW_TIMES_in_p_FTTimes14515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
     FOLLOW_p_AdditiveExpr_in_p_FTRange14550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTRange14568: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTRange14574: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOrder_in_p_FTPosFilter14607: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWindow_in_p_FTPosFilter14611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDistance_in_p_FTPosFilter14615: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTScope_in_p_FTPosFilter14619: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTContent_in_p_FTPosFilter14623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_FTOrder14651: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WINDOW_in_p_FTWindow14681: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTWindow14685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTWindow14687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DISTANCE_in_p_FTDistance14715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTDistance14719: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTDistance14721: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTUnit14751: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCES_in_p_FTUnit14757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPHS_in_p_FTUnit14763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SAME_in_p_FTScope14796: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_DIFFERENT_in_p_FTScope14802: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_p_FTBigUnit_in_p_FTScope14807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCE_in_p_FTBigUnit14837: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPH_in_p_FTBigUnit14843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14878: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_START_in_p_FTContent14882: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14890: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_FTContent14894: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ENTIRE_in_p_FTContent14902: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTContent14906: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_USING_in_p_FTMatchOptions14940: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
-    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStemOption_in_p_FTMatchOption15008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15087: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTCaseOption15091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTCaseOption15113: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LOWERCASE_in_p_FTCaseOption15130: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UPPERCASE_in_p_FTCaseOption15146: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTStemOption15249: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15289: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15298: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15317: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTThesaurusOption15319: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTThesaurusOption15332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTThesaurusOption15338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTThesaurusOption15356: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15360: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTThesaurusID15393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
-    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
-    FOLLOW_LEVELS_in_p_FTThesaurusID15411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTLiteralRange15446: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15466: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTLiteralRange15470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15490: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14568: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTRange14572: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTRange14596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTRange14616: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14618: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTRange14622: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOrder_in_p_FTPosFilter14655: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWindow_in_p_FTPosFilter14659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDistance_in_p_FTPosFilter14663: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTScope_in_p_FTPosFilter14667: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTContent_in_p_FTPosFilter14671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_FTOrder14699: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WINDOW_in_p_FTWindow14729: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTWindow14733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTWindow14735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DISTANCE_in_p_FTDistance14763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTDistance14767: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTDistance14769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTUnit14799: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCES_in_p_FTUnit14805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPHS_in_p_FTUnit14811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SAME_in_p_FTScope14844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_DIFFERENT_in_p_FTScope14850: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_p_FTBigUnit_in_p_FTScope14855: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCE_in_p_FTBigUnit14885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPH_in_p_FTBigUnit14891: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_START_in_p_FTContent14930: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14938: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_FTContent14942: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ENTIRE_in_p_FTContent14950: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTContent14954: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_USING_in_p_FTMatchOptions14988: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
+    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStemOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15135: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTCaseOption15139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTCaseOption15161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LOWERCASE_in_p_FTCaseOption15178: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UPPERCASE_in_p_FTCaseOption15194: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTStemOption15297: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15337: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15365: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTThesaurusOption15367: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTThesaurusOption15380: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTThesaurusOption15386: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTThesaurusOption15404: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15408: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTThesaurusID15441: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
+    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
+    FOLLOW_LEVELS_in_p_FTThesaurusID15459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15556: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15560: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_STOP_in_p_FTStopWordOption15583: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15587: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_FTStopWordOption15591: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_NO_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15616: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTStopWords15654: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15658: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTStopWords15672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15674: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTStopWords15677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15679: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTStopWords15683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNION_in_p_FTStopWordsInclExcl15715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LANGUAGE_in_p_FTLanguageOption15756: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTWildCardOption15797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OPTION_in_p_FTExtensionOption15834: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_FTExtensionOption15838: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WITHOUT_in_p_FTIgnoreOption15868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTIgnoreOption15872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_Statements15935: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndExpr15963: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_HybridExprSingle_in_p_Hybrid16017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statement_in_p_Hybrid16030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AssignStatement_in_p_Statement16061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BreakStatement_in_p_Statement16073: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContinueStatement_in_p_Statement16085: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExitStatement_in_p_Statement16097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarDeclStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_WhileStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_HybridExprSingle16148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_HybridExprSingle16163: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSimple_in_p_ApplyStatement16213: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ApplyStatement16215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_AssignStatement16243: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_AssignStatement16247: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_AssignStatement16251: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_AssignStatement16253: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_AssignStatement16256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockStatement16282: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockStatement16284: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockStatement16287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockHybrid16313: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockHybrid16315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockHybrid16318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BREAK_in_p_BreakStatement16346: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_BreakStatement16352: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_BreakStatement16356: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CONTINUE_in_p_ContinueStatement16384: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_ContinueStatement16390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ContinueStatement16394: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXIT_in_p_ExitStatement16422: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
-    FOLLOW_RETURNING_in_p_ExitStatement16428: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ExitStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ExitStatement16435: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InitialClause_in_p_FLWORStatement16461: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnStatement16498: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnStatement16502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IF_in_p_IfStatement16531: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfStatement16535: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfStatement16537: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfStatement16540: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfStatement16544: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16548: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfStatement16553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchStatement16586: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchStatement16590: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchStatement16592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchStatement16595: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchStatement16602: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchStatement16608: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchStatement16612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseStatement16642: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseStatement16652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TRY_in_p_TryCatchStatement16685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchStatement16694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryCatchHybrid16732: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchHybrid16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchStatement16785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchStatement16787: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchStatement16790: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchStatement16797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchStatement16804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchStatement16808: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchStatement16816: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseStatement16849: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseStatement16856: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseStatement16860: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_CaseStatement16868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseStatement16872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_CaseStatement16876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_VarDeclStatement16903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_VARIABLE_in_p_VarDeclStatement16908: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16914: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16918: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16926: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_COMMA_in_p_VarDeclStatement16944: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16948: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16952: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_SEMICOLON_in_p_VarDeclStatement16979: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHILE_in_p_WhileStatement17007: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_WhileStatement17011: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_WhileStatement17013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_WhileStatement17016: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_WhileStatement17018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrExpr_in_p_ExprSimple17057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockExpr17098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockExpr17102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_CollectionDecl17133: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_CollectionDecl17137: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
-    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_CollectionTypeDecl17168: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
-    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INDEX_in_p_IndexDecl17211: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexName_in_p_IndexDecl17215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_ON_in_p_IndexDecl17219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODES_in_p_IndexDecl17225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_IndexDecl17233: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_IndexDecl17240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_QName_in_p_IndexName17269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
-    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_IndexKeyTypeDecl17377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicType17409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_IndexKeyCollation17436: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INTEGRITY_in_p_ICDecl17467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
-    FOLLOW_CONSTRAINT_in_p_ICDecl17473: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICDecl17477: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
-    FOLLOW_p_ICCollection_in_p_ICDecl17480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICForeignKey_in_p_ICDecl17484: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ON_in_p_ICCollection17512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICCollection17518: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollection17522: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
-    FOLLOW_p_ICCollSequence_in_p_ICCollection17525: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollNode_in_p_ICCollection17533: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequence17561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequence17565: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequence17571: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollSequence17575: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollSequenceUnique17603: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequenceUnique17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequenceUnique17619: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
-    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICCollSequenceUnique17631: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREACH_in_p_ICCollNode17662: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollNode17668: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollNode17674: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollNode17678: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollNode17684: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollNode17688: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREIGN_in_p_ICForeignKey17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKey17722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_ICForeignKeySource17755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TO_in_p_ICForeignKeyTarget17786: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICForeignKeyValues17825: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKeyValues17841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15538: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTLiteralRange15542: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTLiteralRange15562: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTLiteralRange15566: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15608: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_STOP_in_p_FTStopWordOption15631: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15635: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_FTStopWordOption15639: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_NO_in_p_FTStopWordOption15660: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15664: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTStopWords15702: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15706: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTStopWords15720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTStopWords15725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15727: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTStopWords15731: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNION_in_p_FTStopWordsInclExcl15763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LANGUAGE_in_p_FTLanguageOption15804: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTWildCardOption15845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OPTION_in_p_FTExtensionOption15882: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_FTExtensionOption15886: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WITHOUT_in_p_FTIgnoreOption15916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTIgnoreOption15920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_Statements15983: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndExpr16011: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_HybridExprSingle_in_p_Hybrid16065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statement_in_p_Hybrid16078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AssignStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BreakStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContinueStatement_in_p_Statement16133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExitStatement_in_p_Statement16145: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarDeclStatement_in_p_Statement16157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_WhileStatement_in_p_Statement16169: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_HybridExprSingle16196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_HybridExprSingle16211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSimple_in_p_ApplyStatement16261: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ApplyStatement16263: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_AssignStatement16291: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_AssignStatement16295: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_AssignStatement16299: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_AssignStatement16301: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_AssignStatement16304: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockStatement16330: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockStatement16332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockStatement16335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockHybrid16361: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockHybrid16363: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockHybrid16366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BREAK_in_p_BreakStatement16394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_BreakStatement16400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_BreakStatement16404: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONTINUE_in_p_ContinueStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_ContinueStatement16438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ContinueStatement16442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXIT_in_p_ExitStatement16470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
+    FOLLOW_RETURNING_in_p_ExitStatement16476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ExitStatement16480: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ExitStatement16483: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_InitialClause_in_p_FLWORStatement16509: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnStatement16546: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnStatement16550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IF_in_p_IfStatement16579: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfStatement16583: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfStatement16585: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfStatement16588: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfStatement16592: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16596: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfStatement16601: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchStatement16634: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchStatement16638: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchStatement16640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchStatement16643: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchStatement16650: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchStatement16656: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchStatement16660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseStatement16690: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseStatement16700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TRY_in_p_TryCatchStatement16733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchStatement16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryCatchHybrid16780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchHybrid16790: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchStatement16833: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchStatement16835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchStatement16838: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchStatement16845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchStatement16852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchStatement16856: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseStatement16897: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseStatement16904: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseStatement16908: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseStatement16912: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_CaseStatement16916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseStatement16920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_CaseStatement16924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_VarDeclStatement16951: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_VARIABLE_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement16966: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement16974: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_COMMA_in_p_VarDeclStatement16992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement17000: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement17008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_SEMICOLON_in_p_VarDeclStatement17027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHILE_in_p_WhileStatement17055: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_WhileStatement17059: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_WhileStatement17061: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_WhileStatement17064: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_WhileStatement17066: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrExpr_in_p_ExprSimple17105: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockExpr17146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockExpr17150: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_CollectionDecl17181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_CollectionDecl17185: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
+    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_CollectionTypeDecl17216: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
+    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INDEX_in_p_IndexDecl17259: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexName_in_p_IndexDecl17263: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_ON_in_p_IndexDecl17267: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODES_in_p_IndexDecl17273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_IndexDecl17281: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_IndexDecl17288: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_QName_in_p_IndexName17317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
+    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_IndexKeyTypeDecl17425: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicType17457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_IndexKeyCollation17484: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INTEGRITY_in_p_ICDecl17515: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
+    FOLLOW_CONSTRAINT_in_p_ICDecl17521: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICDecl17525: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
+    FOLLOW_p_ICCollection_in_p_ICDecl17528: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICForeignKey_in_p_ICDecl17532: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ON_in_p_ICCollection17560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICCollection17566: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollection17570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
+    FOLLOW_p_ICCollSequence_in_p_ICCollection17573: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollNode_in_p_ICCollection17581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequence17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequence17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequence17619: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollSequence17623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollSequenceUnique17651: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequenceUnique17661: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequenceUnique17667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
+    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICCollSequenceUnique17679: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREACH_in_p_ICCollNode17710: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollNode17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollNode17722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollNode17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollNode17732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollNode17736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREIGN_in_p_ICForeignKey17764: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKey17770: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_ICForeignKeySource17803: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TO_in_p_ICForeignKeyTarget17834: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17869: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICForeignKeyValues17873: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17883: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKeyValues17889: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_synpred1_XQueryParser3535: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
     FOLLOW_DOLLAR_in_synpred1_XQueryParser3543: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_FOR_in_synpred1_XQueryParser3549: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
@@ -61828,37 +61873,37 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_LPAREN_in_synpred4_XQueryParser3635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_TRY_in_synpred5_XQueryParser3655: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
     FOLLOW_LBRACKET_in_synpred5_XQueryParser3657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_synpred6_XQueryParser6185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
-    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPE_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_synpred7_XQueryParser6549: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred8_XQueryParser6665: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6718: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_synpred9_XQueryParser6726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6729: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6747: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred9_XQueryParser6755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6758: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6776: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6788: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_synpred10_XQueryParser6818: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_synpred11_XQueryParser6837: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred11_XQueryParser6839: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred14_XQueryParser7315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_synpred14_XQueryParser7317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred15_XQueryParser7335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred16_XQueryParser7591: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
+    FOLLOW_VALIDATE_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
+    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPE_in_synpred6_XQueryParser6197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_synpred7_XQueryParser6553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred8_XQueryParser6669: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_synpred9_XQueryParser6730: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6733: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6751: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred9_XQueryParser6759: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6762: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6792: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_synpred10_XQueryParser6822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_synpred11_XQueryParser6841: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred11_XQueryParser6843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred14_XQueryParser7319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_synpred14_XQueryParser7321: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred15_XQueryParser7339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred16_XQueryParser7595: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
 });
 
 })();
 exports.XQueryParser = XQueryParser;
 });define('ace/mode/xquery/StringLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-20 08:26:29
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-23 09:26:59
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -63543,7 +63588,7 @@ org.antlr.lang.extend(StringLexer.DFA8, org.antlr.runtime.DFA, {
 })();
 exports.StringLexer = StringLexer;
 });define('ace/mode/xquery/XMLLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-20 08:26:30
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-23 09:27:01
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -66679,8 +66724,9 @@ define('ace/mode/xquery/XQuerySemanticHighlighter', ['require', 'exports', 'modu
         }
         //Check if the tokenized line is equal to the original one:
         if(sourceLine == tokenizedLine) {
-          result[i] = { line: sourceLine, startState: previousState, tokens: { tokens: lineTokens, state: nextState } };
+          result[i] = { tokens: lineTokens, state: nextState };
         } else {
+          result[i] = false; 
         }
       }
       return result;
diff --git a/build/src/mode-xquery-noconflict.js b/build/src/mode-xquery-noconflict.js
index b0472ffe..de4556e2 100644
--- a/build/src/mode-xquery-noconflict.js
+++ b/build/src/mode-xquery-noconflict.js
@@ -1 +1 @@
-ace.define("ace/mode/xquery",["require","exports","module","ace/worker/worker_client","ace/lib/oop","ace/mode/text","ace/mode/xquery_tokenizer","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../worker/worker_client").WorkerClient,e=a("../lib/oop"),f=a("./text").Mode,g=a("./xquery_tokenizer").XQueryTokenizer,h=a("./behaviour/xquery").XQueryBehaviour,i=a("../range").Range,j=function(a){this.$tokenizer=new g,this.$behaviour=new h(a)};e.inherits(j,f),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new i(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(:"+f+":)")},this.createWorker=function(a){var b=new d(["ace"],"worker-xquery.js","ace/mode/xquery_worker","XQueryWorker"),c=this;return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b.on("highlight",function(b){c.$tokenizer.cache=b.data;var d=0,e=a.getLength()-1,f=a.bgTokenizer.currentLine,g=a.bgTokenizer.lines[f];a.bgTokenizer.lines=[],a.bgTokenizer.lines[f]=g,a.bgTokenizer.fireUpdateEvent(d,e)}),b}}.call(j.prototype),b.Mode=j}),ace.define("ace/mode/xquery_tokenizer",["require","exports","module","ace/tokenizer","ace/mode/xquery_highlight_rules"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./xquery_highlight_rules").XQueryHighlightRules,f=b.XQueryTokenizer=function(){this.cache=[],this.$regexpTokenizer=new d((new e).getRules())};(function(){this.getLineTokens=function(a,b){var c=null;for(var d in this.cache){var e=this.cache[d];if(e&&e.line==a&&e.startState==b)return e.tokens}return this.$regexpTokenizer.getLineTokens(a,b)}}).call(f.prototype)}),ace.define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),ace.define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+ace.define("ace/mode/xquery",["require","exports","module","ace/worker/worker_client","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xquery_highlight_rules","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../worker/worker_client").WorkerClient,e=a("../lib/oop"),f=a("./text").Mode,g=a("../tokenizer").Tokenizer,h=a("./xquery_highlight_rules").XQueryHighlightRules,i=a("./behaviour/xquery").XQueryBehaviour,j=a("../range").Range,k=function(a){this.$tokenizer=new g((new h).getRules()),this.$behaviour=new i(a)};e.inherits(k,f),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new j(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var i=new j(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),i.start.row=e,i.end.row=e,i.end.column=f.length,b.replace(i,g?f.match(h)[1]:"(:"+f+":)")},this.deltas=[],this.createWorker=function(a){var b=new d(["ace"],"worker-xquery.js","ace/mode/xquery_worker","XQueryWorker"),c=this;return a.getDocument().on("change",function(a){c.deltas.push(a.data)}),b.attachToDocument(a.getDocument()),b.on("start",function(a){c.deltas=[]}),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b.on("highlight",function(b){var d=0,e=a.getLength()-1,f=b.data;for(var g in c.deltas){var h=c.deltas[g];if(h.action==="insertLines"){var i=h.range.end.row-h.range.start.row;this.$insertNewRows(h.range.start.row,i);for(var g=0;g<i;g++)f.splice(h.range.start.row+g,0,undefined)}else if(h.action==="insertText")a.getDocument().isNewLine(h.text)?f.splice(h.range.start.row,0,undefined):delete f[h.range.start.row];else if(h.action==="removeLines"){var j=h.range.end.row-h.range.start.row;f.splice(h.range.start.row,j)}else h.action==="removeText"&&(a.getDocument().isNewLine(h.text)?f.splice(h.range.start.row,0):delete f[h.range.start.row])}a.bgTokenizer.lines=f,a.bgTokenizer.fireUpdateEvent(d,e)}),b}}.call(k.prototype),b.Mode=k}),ace.define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),ace.define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
diff --git a/build/src/mode-xquery-uncompressed-noconflict.js b/build/src/mode-xquery-uncompressed-noconflict.js
index c9ca14e0..bcc00110 100644
--- a/build/src/mode-xquery-uncompressed-noconflict.js
+++ b/build/src/mode-xquery-uncompressed-noconflict.js
@@ -35,18 +35,19 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-ace.define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/xquery_tokenizer', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
+ace.define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
 "use strict";
 
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var XQueryTokenizer = require("./xquery_tokenizer").XQueryTokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new XQueryTokenizer();
+    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -116,11 +117,22 @@ oop.inherits(Mode, TextMode);
         }
     };
     
+    this.deltas = [];
+
     this.createWorker = function(session) {
         var worker = new WorkerClient(["ace"], "worker-xquery.js", "ace/mode/xquery_worker", "XQueryWorker");
-        var self = this;
+        var that = this;
+
+        session.getDocument().on('change', function(evt){
+          that.deltas.push(evt.data);
+        });
+        
         worker.attachToDocument(session.getDocument());
         
+        worker.on("start", function(e) {
+          that.deltas = [];
+        });
+
         worker.on("error", function(e) {
           session.setAnnotations([e.data]);
         });
@@ -130,15 +142,47 @@ oop.inherits(Mode, TextMode);
         });
         
         worker.on("highlight", function(tokens) {
-          self.$tokenizer.cache = tokens.data;
           var firstRow = 0;
           var lastRow = session.getLength() - 1;
-          var currentLineIndex = session.bgTokenizer.currentLine;
-          var currentLine = session.bgTokenizer.lines[currentLineIndex];
-          session.bgTokenizer.lines = [];
-          session.bgTokenizer.lines[currentLineIndex] = currentLine;
+          
+          var lines = tokens.data;
+          
+          for(var i in that.deltas)
+          {
+            var delta = that.deltas[i];
+            if (delta.action === "insertLines")
+            {
+              var newLineCount = delta.range.end.row - delta.range.start.row;
+              this.$insertNewRows(delta.range.start.row, newLineCount);
+              for (var i = 0; i < newLineCount; i++) {
+                lines.splice(delta.range.start.row + i, 0, undefined);
+              }
+            }
+            else if (delta.action === "insertText")
+            {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0, undefined);
+              } else {
+                delete lines[delta.range.start.row];
+              } 
+            } else if (delta.action === "removeLines") {
+              var oldLineCount = delta.range.end.row - delta.range.start.row;
+              lines.splice(delta.range.start.row, oldLineCount);
+            } else if (delta.action === "removeText") {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0);
+              } else {
+                delete lines[delta.range.start.row];
+              }
+            }           
+          }
+          
+          session.bgTokenizer.lines = lines;
           session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
         });
+        
         return worker;
     };
     
@@ -146,68 +190,6 @@ oop.inherits(Mode, TextMode);
 
 exports.Mode = Mode;
 });
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-ace.define('ace/mode/xquery_tokenizer', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/xquery_highlight_rules'], function(require, exports, module) {
-"use strict";
-  
-  var Tokenizer = require("../tokenizer").Tokenizer;
-  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-
-  var XQueryTokenizer = exports.XQueryTokenizer = function(){
-    this.cache = [];
-    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-  };
-
-  (function() {
-    this.getLineTokens = function(line, startState) {
-      var cachedLine = null;
-      for(var i in this.cache)
-      {
-        var c = this.cache[i];
-        if(c && c.line == line && c.startState == startState) {
-          return c.tokens;
-        }
-      }
-      return this.$regexpTokenizer.getLineTokens(line, startState);
-    };
-  }).call(XQueryTokenizer.prototype);
-}); 
 /*
  *  eXide - web-based XQuery IDE
  *  
diff --git a/build/src/mode-xquery-uncompressed.js b/build/src/mode-xquery-uncompressed.js
index be21fed0..74642c61 100644
--- a/build/src/mode-xquery-uncompressed.js
+++ b/build/src/mode-xquery-uncompressed.js
@@ -35,18 +35,19 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/xquery_tokenizer', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
+define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/worker/worker_client', 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
 "use strict";
 
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var XQueryTokenizer = require("./xquery_tokenizer").XQueryTokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new XQueryTokenizer();
+    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -116,11 +117,22 @@ oop.inherits(Mode, TextMode);
         }
     };
     
+    this.deltas = [];
+
     this.createWorker = function(session) {
         var worker = new WorkerClient(["ace"], "worker-xquery.js", "ace/mode/xquery_worker", "XQueryWorker");
-        var self = this;
+        var that = this;
+
+        session.getDocument().on('change', function(evt){
+          that.deltas.push(evt.data);
+        });
+        
         worker.attachToDocument(session.getDocument());
         
+        worker.on("start", function(e) {
+          that.deltas = [];
+        });
+
         worker.on("error", function(e) {
           session.setAnnotations([e.data]);
         });
@@ -130,15 +142,47 @@ oop.inherits(Mode, TextMode);
         });
         
         worker.on("highlight", function(tokens) {
-          self.$tokenizer.cache = tokens.data;
           var firstRow = 0;
           var lastRow = session.getLength() - 1;
-          var currentLineIndex = session.bgTokenizer.currentLine;
-          var currentLine = session.bgTokenizer.lines[currentLineIndex];
-          session.bgTokenizer.lines = [];
-          session.bgTokenizer.lines[currentLineIndex] = currentLine;
+          
+          var lines = tokens.data;
+          
+          for(var i in that.deltas)
+          {
+            var delta = that.deltas[i];
+            if (delta.action === "insertLines")
+            {
+              var newLineCount = delta.range.end.row - delta.range.start.row;
+              this.$insertNewRows(delta.range.start.row, newLineCount);
+              for (var i = 0; i < newLineCount; i++) {
+                lines.splice(delta.range.start.row + i, 0, undefined);
+              }
+            }
+            else if (delta.action === "insertText")
+            {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0, undefined);
+              } else {
+                delete lines[delta.range.start.row];
+              } 
+            } else if (delta.action === "removeLines") {
+              var oldLineCount = delta.range.end.row - delta.range.start.row;
+              lines.splice(delta.range.start.row, oldLineCount);
+            } else if (delta.action === "removeText") {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0);
+              } else {
+                delete lines[delta.range.start.row];
+              }
+            }           
+          }
+          
+          session.bgTokenizer.lines = lines;
           session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
         });
+        
         return worker;
     };
     
@@ -146,68 +190,6 @@ oop.inherits(Mode, TextMode);
 
 exports.Mode = Mode;
 });
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define('ace/mode/xquery_tokenizer', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/xquery_highlight_rules'], function(require, exports, module) {
-"use strict";
-  
-  var Tokenizer = require("../tokenizer").Tokenizer;
-  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-
-  var XQueryTokenizer = exports.XQueryTokenizer = function(){
-    this.cache = [];
-    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-  };
-
-  (function() {
-    this.getLineTokens = function(line, startState) {
-      var cachedLine = null;
-      for(var i in this.cache)
-      {
-        var c = this.cache[i];
-        if(c && c.line == line && c.startState == startState) {
-          return c.tokens;
-        }
-      }
-      return this.$regexpTokenizer.getLineTokens(line, startState);
-    };
-  }).call(XQueryTokenizer.prototype);
-}); 
 /*
  *  eXide - web-based XQuery IDE
  *  
diff --git a/build/src/mode-xquery.js b/build/src/mode-xquery.js
index 0017ca07..4b686a3c 100644
--- a/build/src/mode-xquery.js
+++ b/build/src/mode-xquery.js
@@ -1 +1 @@
-define("ace/mode/xquery",["require","exports","module","ace/worker/worker_client","ace/lib/oop","ace/mode/text","ace/mode/xquery_tokenizer","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../worker/worker_client").WorkerClient,e=a("../lib/oop"),f=a("./text").Mode,g=a("./xquery_tokenizer").XQueryTokenizer,h=a("./behaviour/xquery").XQueryBehaviour,i=a("../range").Range,j=function(a){this.$tokenizer=new g,this.$behaviour=new h(a)};e.inherits(j,f),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new i(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(:"+f+":)")},this.createWorker=function(a){var b=new d(["ace"],"worker-xquery.js","ace/mode/xquery_worker","XQueryWorker"),c=this;return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b.on("highlight",function(b){c.$tokenizer.cache=b.data;var d=0,e=a.getLength()-1,f=a.bgTokenizer.currentLine,g=a.bgTokenizer.lines[f];a.bgTokenizer.lines=[],a.bgTokenizer.lines[f]=g,a.bgTokenizer.fireUpdateEvent(d,e)}),b}}.call(j.prototype),b.Mode=j}),define("ace/mode/xquery_tokenizer",["require","exports","module","ace/tokenizer","ace/mode/xquery_highlight_rules"],function(a,b,c){"use strict";var d=a("../tokenizer").Tokenizer,e=a("./xquery_highlight_rules").XQueryHighlightRules,f=b.XQueryTokenizer=function(){this.cache=[],this.$regexpTokenizer=new d((new e).getRules())};(function(){this.getLineTokens=function(a,b){var c=null;for(var d in this.cache){var e=this.cache[d];if(e&&e.line==a&&e.startState==b)return e.tokens}return this.$regexpTokenizer.getLineTokens(a,b)}}).call(f.prototype)}),define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
+define("ace/mode/xquery",["require","exports","module","ace/worker/worker_client","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xquery_highlight_rules","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../worker/worker_client").WorkerClient,e=a("../lib/oop"),f=a("./text").Mode,g=a("../tokenizer").Tokenizer,h=a("./xquery_highlight_rules").XQueryHighlightRules,i=a("./behaviour/xquery").XQueryBehaviour,j=a("../range").Range,k=function(a){this.$tokenizer=new g((new h).getRules()),this.$behaviour=new i(a)};e.inherits(k,f),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new j(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var i=new j(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),i.start.row=e,i.end.row=e,i.end.column=f.length,b.replace(i,g?f.match(h)[1]:"(:"+f+":)")},this.deltas=[],this.createWorker=function(a){var b=new d(["ace"],"worker-xquery.js","ace/mode/xquery_worker","XQueryWorker"),c=this;return a.getDocument().on("change",function(a){c.deltas.push(a.data)}),b.attachToDocument(a.getDocument()),b.on("start",function(a){c.deltas=[]}),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b.on("highlight",function(b){var d=0,e=a.getLength()-1,f=b.data;for(var g in c.deltas){var h=c.deltas[g];if(h.action==="insertLines"){var i=h.range.end.row-h.range.start.row;this.$insertNewRows(h.range.start.row,i);for(var g=0;g<i;g++)f.splice(h.range.start.row+g,0,undefined)}else if(h.action==="insertText")a.getDocument().isNewLine(h.text)?f.splice(h.range.start.row,0,undefined):delete f[h.range.start.row];else if(h.action==="removeLines"){var j=h.range.end.row-h.range.start.row;f.splice(h.range.start.row,j)}else h.action==="removeText"&&(a.getDocument().isNewLine(h.text)?f.splice(h.range.start.row,0):delete f[h.range.start.row])}a.bgTokenizer.lines=f,a.bgTokenizer.fireUpdateEvent(d,e)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
diff --git a/build/src/worker-xquery.js b/build/src/worker-xquery.js
index 9670498e..f056d536 100644
--- a/build/src/worker-xquery.js
+++ b/build/src/worker-xquery.js
@@ -1560,6 +1560,7 @@ oop.inherits(XQueryWorker, Mirror);
 (function() {
     
   this.onUpdate = function() {
+    this.sender.emit("start");
     var value = this.doc.getValue();    
     var parser = xquery.getParser(value);
     var ast = parser.p_Module();
@@ -8950,7 +8951,7 @@ exports.org = org;
 
 });
 define('ace/mode/xquery/XQueryLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-20 08:26:27
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-23 09:26:57
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -19381,7 +19382,7 @@ org.antlr.lang.extend(XQDTLexer, org.antlr.runtime.Lexer, {
 
 });
 define('ace/mode/xquery/XQueryParser', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/StringLexer', 'ace/mode/xquery/XMLLexer', 'ace/mode/xquery/XQueryLexer', 'ace/mode/xquery/XQDTParser', 'ace/mode/xquery/Position'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-20 08:26:36
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-23 09:27:07
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -19441,6 +19442,8 @@ var XQueryParser = function(input, state) {
     (function(){
 
 
+        this.isInAttr = false;
+
         this.errors = [];
 
         this.hasErrors = function(){
@@ -20309,7 +20312,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:293:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
+    // xquery/XQueryParser.g:295:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
     // $ANTLR start "p_Module"
     p_Module: function() {
         var retval = new XQueryParser.p_Module_return();
@@ -20328,14 +20331,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_LibraryModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_LibraryModule");
         var stream_p_MainModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_MainModule");
         try {
-            // xquery/XQueryParser.g:294:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
-            // xquery/XQueryParser.g:294:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
-            // xquery/XQueryParser.g:294:13: (vd= p_VersionDecl )?
+            // xquery/XQueryParser.g:296:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
+            // xquery/XQueryParser.g:296:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
+            // xquery/XQueryParser.g:296:13: (vd= p_VersionDecl )?
             var alt1=2;
             alt1 = this.dfa1.predict(this.input);
             switch (alt1) {
                 case 1 :
-                    // xquery/XQueryParser.g:294:13: vd= p_VersionDecl
+                    // xquery/XQueryParser.g:296:13: vd= p_VersionDecl
                     this.pushFollow(XQueryParser.FOLLOW_p_VersionDecl_in_p_Module507);
                     vd=this.p_VersionDecl();
 
@@ -20348,12 +20351,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
+            // xquery/XQueryParser.g:297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
             var alt2=2;
             alt2 = this.dfa2.predict(this.input);
             switch (alt2) {
                 case 1 :
-                    // xquery/XQueryParser.g:296:15: lm= p_LibraryModule[$vd.tree]
+                    // xquery/XQueryParser.g:298:15: lm= p_LibraryModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_LibraryModule_in_p_Module540);
                     lm=this.p_LibraryModule((vd?vd.tree:null));
 
@@ -20373,7 +20376,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 296:44: ->
+                    // 298:44: ->
                     {
                         this.adaptor.addChild(root_0, (lm?lm.tree:null));
 
@@ -20383,7 +20386,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:297:15: mm= p_MainModule[$vd.tree]
+                    // xquery/XQueryParser.g:299:15: mm= p_MainModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_MainModule_in_p_Module563);
                     mm=this.p_MainModule((vd?vd.tree:null));
 
@@ -20403,7 +20406,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 297:44: ->
+                    // 299:44: ->
                     {
                         this.adaptor.addChild(root_0, (mm?mm.tree:null));
 
@@ -20454,7 +20457,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:302:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
+    // xquery/XQueryParser.g:304:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
     // $ANTLR start "p_VersionDecl"
     p_VersionDecl: function() {
         var retval = new XQueryParser.p_VersionDecl_return();
@@ -20475,15 +20478,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_XQUERY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token XQUERY");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:303:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
-            // xquery/XQueryParser.g:303:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:305:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
+            // xquery/XQueryParser.g:305:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
             k=this.match(this.input,XQUERY,XQueryParser.FOLLOW_XQUERY_in_p_VersionDecl615); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_XQUERY.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:303:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
+            // xquery/XQueryParser.g:305:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
             var alt4=2;
             var LA4_0 = this.input.LA(1);
 
@@ -20502,9 +20505,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt4) {
                 case 1 :
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:37: k= ENCODING enc= p_StringLiteral
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:37: k= ENCODING enc= p_StringLiteral
                     k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl623); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -20524,9 +20527,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
                     k=this.match(this.input,VERSION,XQueryParser.FOLLOW_VERSION_in_p_VersionDecl650); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_VERSION.add(k);
 
@@ -20539,7 +20542,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(ver.getTree());
-                    // xquery/XQueryParser.g:304:59: (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:59: (k= ENCODING enc= p_StringLiteral )?
                     var alt3=2;
                     var LA3_0 = this.input.LA(1);
 
@@ -20548,7 +20551,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt3) {
                         case 1 :
-                            // xquery/XQueryParser.g:304:60: k= ENCODING enc= p_StringLiteral
+                            // xquery/XQueryParser.g:306:60: k= ENCODING enc= p_StringLiteral
                             k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl661); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -20582,7 +20585,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: enc, ver
+            // elements: ver, enc
             // token labels: 
             // rule labels: retval, ver, enc
             // token list labels: 
@@ -20594,19 +20597,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_enc=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token enc",enc!=null?enc.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 305:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+            // 307:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
             {
-                // xquery/XQueryParser.g:305:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+                // xquery/XQueryParser.g:307:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VersionDecl, "VersionDecl"), root_1);
 
-                // xquery/XQueryParser.g:305:34: ^( VersionDeclVersion ( $ver)? )
+                // xquery/XQueryParser.g:307:34: ^( VersionDeclVersion ( $ver)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclVersion, "VersionDeclVersion"), root_2);
 
-                // xquery/XQueryParser.g:305:55: ( $ver)?
+                // xquery/XQueryParser.g:307:55: ( $ver)?
                 if ( stream_ver.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ver.nextTree());
 
@@ -20615,12 +20618,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:305:62: ^( VersionDeclEncoding ( $enc)? )
+                // xquery/XQueryParser.g:307:62: ^( VersionDeclEncoding ( $enc)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclEncoding, "VersionDeclEncoding"), root_2);
 
-                // xquery/XQueryParser.g:305:84: ( $enc)?
+                // xquery/XQueryParser.g:307:84: ( $enc)?
                 if ( stream_enc.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_enc.nextTree());
 
@@ -20671,7 +20674,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:309:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
+    // xquery/XQueryParser.g:311:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
     // $ANTLR start "p_MainModule"
     p_MainModule: function(vd) {
         var retval = new XQueryParser.p_MainModule_return();
@@ -20685,8 +20688,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_QueryBody=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_QueryBody");
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         try {
-            // xquery/XQueryParser.g:310:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
-            // xquery/XQueryParser.g:310:11: pm_Prolog pm_QueryBody
+            // xquery/XQueryParser.g:312:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
+            // xquery/XQueryParser.g:312:11: pm_Prolog pm_QueryBody
             this.pushFollow(XQueryParser.FOLLOW_pm_Prolog_in_p_MainModule739);
             pm_Prolog3=this.pm_Prolog();
 
@@ -20712,9 +20715,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 311:17: -> ^( MainModule pm_Prolog )
+            // 313:17: -> ^( MainModule pm_Prolog )
             {
-                // xquery/XQueryParser.g:311:20: ^( MainModule pm_Prolog )
+                // xquery/XQueryParser.g:313:20: ^( MainModule pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(MainModule, "MainModule"), root_1);
@@ -20763,7 +20766,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:315:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
+    // xquery/XQueryParser.g:317:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
     // $ANTLR start "p_LibraryModule"
     p_LibraryModule: function(vd) {
         var retval = new XQueryParser.p_LibraryModule_return();
@@ -20777,8 +20780,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         var stream_p_ModuleDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ModuleDecl");
         try {
-            // xquery/XQueryParser.g:316:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
-            // xquery/XQueryParser.g:316:11: p_ModuleDecl pm_Prolog
+            // xquery/XQueryParser.g:318:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
+            // xquery/XQueryParser.g:318:11: p_ModuleDecl pm_Prolog
             this.pushFollow(XQueryParser.FOLLOW_p_ModuleDecl_in_p_LibraryModule797);
             p_ModuleDecl5=this.p_ModuleDecl();
 
@@ -20794,7 +20797,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_ModuleDecl, pm_Prolog
+            // elements: pm_Prolog, p_ModuleDecl
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -20804,9 +20807,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 317:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
+            // 319:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
             {
-                // xquery/XQueryParser.g:317:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
+                // xquery/XQueryParser.g:319:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(LibraryModule, "LibraryModule"), root_1);
@@ -20856,7 +20859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:321:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
+    // xquery/XQueryParser.g:323:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
     // $ANTLR start "p_ModuleDecl"
     p_ModuleDecl: function() {
         var retval = new XQueryParser.p_ModuleDecl_return();
@@ -20881,8 +20884,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:322:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
-            // xquery/XQueryParser.g:322:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:324:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
+            // xquery/XQueryParser.g:324:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
             k=this.match(this.input,MODULE,XQueryParser.FOLLOW_MODULE_in_p_ModuleDecl855); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_MODULE.add(k);
 
@@ -20929,9 +20932,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 323:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
+            // 325:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
             {
-                // xquery/XQueryParser.g:323:21: ^( ModuleDecl p_NCName p_StringLiteral )
+                // xquery/XQueryParser.g:325:21: ^( ModuleDecl p_NCName p_StringLiteral )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleDecl, "ModuleDecl"), root_1);
@@ -20980,7 +20983,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:329:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
+    // xquery/XQueryParser.g:331:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
     // $ANTLR start "pm_Prolog"
     pm_Prolog: function() {
         var retval = new XQueryParser.pm_Prolog_return();
@@ -21007,17 +21010,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_OrderedDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_OrderedDecl");
         var stream_pm_FTOptionDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_FTOptionDecl");
         try {
-            // xquery/XQueryParser.g:330:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
+            // xquery/XQueryParser.g:332:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
             loop6:
             do {
                 var alt6=2;
                 alt6 = this.dfa6.predict(this.input);
                 switch (alt6) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
                     var alt5=5;
                     var LA5_0 = this.input.LA(1);
 
@@ -21073,7 +21076,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt5) {
                         case 1 :
-                            // xquery/XQueryParser.g:330:13: dnd+= pm_DefaultNamespaceDecl
+                            // xquery/XQueryParser.g:332:13: dnd+= pm_DefaultNamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_DefaultNamespaceDecl_in_pm_Prolog928);
                             dnd=this.pm_DefaultNamespaceDecl();
 
@@ -21087,7 +21090,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:330:44: s+= p_Setter
+                            // xquery/XQueryParser.g:332:44: s+= p_Setter
                             this.pushFollow(XQueryParser.FOLLOW_p_Setter_in_pm_Prolog934);
                             s=this.p_Setter();
 
@@ -21101,7 +21104,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:330:58: nd+= pm_NamespaceDecl
+                            // xquery/XQueryParser.g:332:58: nd+= pm_NamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_NamespaceDecl_in_pm_Prolog940);
                             nd=this.pm_NamespaceDecl();
 
@@ -21115,7 +21118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 4 :
-                            // xquery/XQueryParser.g:330:81: i+= p_Import
+                            // xquery/XQueryParser.g:332:81: i+= p_Import
                             this.pushFollow(XQueryParser.FOLLOW_p_Import_in_pm_Prolog946);
                             i=this.p_Import();
 
@@ -21129,7 +21132,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 5 :
-                            // xquery/XQueryParser.g:330:95: fto+= pm_FTOptionDecl
+                            // xquery/XQueryParser.g:332:95: fto+= pm_FTOptionDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_FTOptionDecl_in_pm_Prolog952);
                             fto=this.pm_FTOptionDecl();
 
@@ -21154,7 +21157,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:330:121: (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:121: (od+= pg_OrderedDecl )*
             loop7:
             do {
                 var alt7=2;
@@ -21173,7 +21176,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt7) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:121: od+= pg_OrderedDecl
+                    // xquery/XQueryParser.g:332:121: od+= pg_OrderedDecl
                     this.pushFollow(XQueryParser.FOLLOW_pg_OrderedDecl_in_pm_Prolog959);
                     od=this.pg_OrderedDecl();
 
@@ -21195,7 +21198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nd, i, s, od, fto, dnd
+            // elements: s, nd, dnd, fto, od, i
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -21210,19 +21213,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_dnd=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token dnd",list_dnd);
             var stream_i=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token i",list_i);
             root_0 = this.adaptor.nil();
-            // 331:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+            // 333:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
             {
-                // xquery/XQueryParser.g:331:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+                // xquery/XQueryParser.g:333:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Prolog, "Prolog"), root_1);
 
-                // xquery/XQueryParser.g:332:33: ^( DefaultNamespaceDecls ( $dnd)* )
+                // xquery/XQueryParser.g:334:33: ^( DefaultNamespaceDecls ( $dnd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DefaultNamespaceDecls, "DefaultNamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:332:57: ( $dnd)*
+                // xquery/XQueryParser.g:334:57: ( $dnd)*
                 while ( stream_dnd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_dnd.nextTree());
 
@@ -21231,12 +21234,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:333:33: ^( Setters ( $s)* )
+                // xquery/XQueryParser.g:335:33: ^( Setters ( $s)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Setters, "Setters"), root_2);
 
-                // xquery/XQueryParser.g:333:43: ( $s)*
+                // xquery/XQueryParser.g:335:43: ( $s)*
                 while ( stream_s.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_s.nextTree());
 
@@ -21245,12 +21248,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:334:33: ^( NamespaceDecls ( $nd)* )
+                // xquery/XQueryParser.g:336:33: ^( NamespaceDecls ( $nd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecls, "NamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:334:50: ( $nd)*
+                // xquery/XQueryParser.g:336:50: ( $nd)*
                 while ( stream_nd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nd.nextTree());
 
@@ -21259,12 +21262,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:335:33: ^( Imports ( $i)* )
+                // xquery/XQueryParser.g:337:33: ^( Imports ( $i)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Imports, "Imports"), root_2);
 
-                // xquery/XQueryParser.g:335:43: ( $i)*
+                // xquery/XQueryParser.g:337:43: ( $i)*
                 while ( stream_i.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_i.nextTree());
 
@@ -21273,12 +21276,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:336:33: ^( FTOptionDecls ( $fto)* )
+                // xquery/XQueryParser.g:338:33: ^( FTOptionDecls ( $fto)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(FTOptionDecls, "FTOptionDecls"), root_2);
 
-                // xquery/XQueryParser.g:336:49: ( $fto)*
+                // xquery/XQueryParser.g:338:49: ( $fto)*
                 while ( stream_fto.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_fto.nextTree());
 
@@ -21287,12 +21290,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:337:33: ^( OrderedDecls ( $od)* )
+                // xquery/XQueryParser.g:339:33: ^( OrderedDecls ( $od)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(OrderedDecls, "OrderedDecls"), root_2);
 
-                // xquery/XQueryParser.g:337:48: ( $od)*
+                // xquery/XQueryParser.g:339:48: ( $od)*
                 while ( stream_od.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_od.nextTree());
 
@@ -21343,7 +21346,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:345:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
+    // xquery/XQueryParser.g:347:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
     // $ANTLR start "pg_OrderedDecl"
     pg_OrderedDecl: function() {
         var retval = new XQueryParser.pg_OrderedDecl_return();
@@ -21357,7 +21360,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:346:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
+            // xquery/XQueryParser.g:348:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
             var alt8=3;
             var LA8_0 = this.input.LA(1);
 
@@ -21396,7 +21399,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt8) {
                 case 1 :
-                    // xquery/XQueryParser.g:346:11: pm_ContextItemDecl
+                    // xquery/XQueryParser.g:348:11: pm_ContextItemDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ContextItemDecl_in_pg_OrderedDecl1274);
@@ -21409,7 +21412,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:347:11: pm_AnnotatedDecl
+                    // xquery/XQueryParser.g:349:11: pm_AnnotatedDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_AnnotatedDecl_in_pg_OrderedDecl1286);
@@ -21422,7 +21425,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:348:11: pm_OptionDecl
+                    // xquery/XQueryParser.g:350:11: pm_OptionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OptionDecl_in_pg_OrderedDecl1298);
@@ -21469,7 +21472,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
+    // xquery/XQueryParser.g:358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
     // $ANTLR start "p_Setter"
     p_Setter: function() {
         var retval = new XQueryParser.p_Setter_return();
@@ -21489,12 +21492,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:357:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
+            // xquery/XQueryParser.g:359:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
             var alt9=9;
             alt9 = this.dfa9.predict(this.input);
             switch (alt9) {
                 case 1 :
-                    // xquery/XQueryParser.g:357:11: pm_BoundarySpaceDecl
+                    // xquery/XQueryParser.g:359:11: pm_BoundarySpaceDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BoundarySpaceDecl_in_p_Setter1328);
@@ -21507,7 +21510,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:358:11: pm_DefaultCollationDecl
+                    // xquery/XQueryParser.g:360:11: pm_DefaultCollationDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DefaultCollationDecl_in_p_Setter1340);
@@ -21520,7 +21523,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:359:11: pm_BaseURIDecl
+                    // xquery/XQueryParser.g:361:11: pm_BaseURIDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BaseURIDecl_in_p_Setter1352);
@@ -21533,7 +21536,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:360:11: pm_ConstructionDecl
+                    // xquery/XQueryParser.g:362:11: pm_ConstructionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ConstructionDecl_in_p_Setter1364);
@@ -21546,7 +21549,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:361:11: pm_OrderingModeDecl
+                    // xquery/XQueryParser.g:363:11: pm_OrderingModeDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OrderingModeDecl_in_p_Setter1376);
@@ -21559,7 +21562,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:362:11: pm_EmptyOrderDecl
+                    // xquery/XQueryParser.g:364:11: pm_EmptyOrderDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_EmptyOrderDecl_in_p_Setter1388);
@@ -21572,7 +21575,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:363:11: {...}? => pm_RevalidationDecl
+                    // xquery/XQueryParser.g:365:11: {...}? => pm_RevalidationDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
@@ -21589,7 +21592,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:364:11: pm_CopyNamespacesDecl
+                    // xquery/XQueryParser.g:366:11: pm_CopyNamespacesDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_CopyNamespacesDecl_in_p_Setter1415);
@@ -21602,7 +21605,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:365:11: pm_DecimalFormatDecl
+                    // xquery/XQueryParser.g:367:11: pm_DecimalFormatDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DecimalFormatDecl_in_p_Setter1427);
@@ -21649,7 +21652,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:369:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:371:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
     // $ANTLR start "pm_BoundarySpaceDecl"
     pm_BoundarySpaceDecl: function() {
         var retval = new XQueryParser.pm_BoundarySpaceDecl_return();
@@ -21664,8 +21667,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON23_tree=null;
 
         try {
-            // xquery/XQueryParser.g:370:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
-            // xquery/XQueryParser.g:370:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
+            // xquery/XQueryParser.g:372:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
+            // xquery/XQueryParser.g:372:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BoundarySpaceDecl1459); if (this.state.failed) return retval;
@@ -21684,7 +21687,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:370:68: ( (k= PRESERVE ) | (k= STRIP ) )
+            // xquery/XQueryParser.g:372:68: ( (k= PRESERVE ) | (k= STRIP ) )
             var alt10=2;
             var LA10_0 = this.input.LA(1);
 
@@ -21703,9 +21706,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt10) {
                 case 1 :
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:71: k= PRESERVE
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:71: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_BoundarySpaceDecl1474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -21721,9 +21724,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:101: k= STRIP
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:101: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_BoundarySpaceDecl1484); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -21782,7 +21785,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:374:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:376:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultCollationDecl"
     pm_DefaultCollationDecl: function() {
         var retval = new XQueryParser.pm_DefaultCollationDecl_return();
@@ -21798,8 +21801,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON25_tree=null;
 
         try {
-            // xquery/XQueryParser.g:375:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:375:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:377:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:377:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultCollationDecl1519); if (this.state.failed) return retval;
@@ -21873,7 +21876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:379:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
+    // xquery/XQueryParser.g:381:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
     // $ANTLR start "pm_BaseURIDecl"
     pm_BaseURIDecl: function() {
         var retval = new XQueryParser.pm_BaseURIDecl_return();
@@ -21892,8 +21895,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_BASE_URI=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BASE_URI");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:380:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
-            // xquery/XQueryParser.g:380:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:382:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
+            // xquery/XQueryParser.g:382:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BaseURIDecl1573); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -21929,9 +21932,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 381:17: -> ^( BaseURIDecl $sl)
+            // 383:17: -> ^( BaseURIDecl $sl)
             {
-                // xquery/XQueryParser.g:381:20: ^( BaseURIDecl $sl)
+                // xquery/XQueryParser.g:383:20: ^( BaseURIDecl $sl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(BaseURIDecl, "BaseURIDecl"), root_1);
@@ -21979,7 +21982,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:385:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:387:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
     // $ANTLR start "pm_ConstructionDecl"
     pm_ConstructionDecl: function() {
         var retval = new XQueryParser.pm_ConstructionDecl_return();
@@ -21994,8 +21997,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON27_tree=null;
 
         try {
-            // xquery/XQueryParser.g:386:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
-            // xquery/XQueryParser.g:386:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
+            // xquery/XQueryParser.g:388:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
+            // xquery/XQueryParser.g:388:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ConstructionDecl1640); if (this.state.failed) return retval;
@@ -22014,9 +22017,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:386:66: ( (k= STRIP | k= PRESERVE ) )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:66: ( (k= STRIP | k= PRESERVE ) )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
             var alt11=2;
             var LA11_0 = this.input.LA(1);
 
@@ -22035,7 +22038,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt11) {
                 case 1 :
-                    // xquery/XQueryParser.g:386:69: k= STRIP
+                    // xquery/XQueryParser.g:388:69: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_ConstructionDecl1655); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22045,7 +22048,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:386:79: k= PRESERVE
+                    // xquery/XQueryParser.g:388:79: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_ConstructionDecl1661); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22104,7 +22107,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:390:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:392:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
     // $ANTLR start "pm_OrderingModeDecl"
     pm_OrderingModeDecl: function() {
         var retval = new XQueryParser.pm_OrderingModeDecl_return();
@@ -22119,8 +22122,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON28_tree=null;
 
         try {
-            // xquery/XQueryParser.g:391:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
-            // xquery/XQueryParser.g:391:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
+            // xquery/XQueryParser.g:393:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
+            // xquery/XQueryParser.g:393:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OrderingModeDecl1696); if (this.state.failed) return retval;
@@ -22139,9 +22142,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:391:62: ( (k= ORDERED | k= UNORDERED ) )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:62: ( (k= ORDERED | k= UNORDERED ) )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
             var alt12=2;
             var LA12_0 = this.input.LA(1);
 
@@ -22160,7 +22163,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt12) {
                 case 1 :
-                    // xquery/XQueryParser.g:391:65: k= ORDERED
+                    // xquery/XQueryParser.g:393:65: k= ORDERED
                     k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_pm_OrderingModeDecl1711); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22170,7 +22173,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:391:77: k= UNORDERED
+                    // xquery/XQueryParser.g:393:77: k= UNORDERED
                     k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_pm_OrderingModeDecl1717); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22229,7 +22232,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:395:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:397:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
     // $ANTLR start "pm_EmptyOrderDecl"
     pm_EmptyOrderDecl: function() {
         var retval = new XQueryParser.pm_EmptyOrderDecl_return();
@@ -22244,8 +22247,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON29_tree=null;
 
         try {
-            // xquery/XQueryParser.g:396:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
-            // xquery/XQueryParser.g:396:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
+            // xquery/XQueryParser.g:398:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
+            // xquery/XQueryParser.g:398:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_EmptyOrderDecl1752); if (this.state.failed) return retval;
@@ -22280,9 +22283,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:396:107: ( (k= GREATEST | k= LEAST ) )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:107: ( (k= GREATEST | k= LEAST ) )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
             var alt13=2;
             var LA13_0 = this.input.LA(1);
 
@@ -22301,7 +22304,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt13) {
                 case 1 :
-                    // xquery/XQueryParser.g:396:110: k= GREATEST
+                    // xquery/XQueryParser.g:398:110: k= GREATEST
                     k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_pm_EmptyOrderDecl1779); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22311,7 +22314,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:396:123: k= LEAST
+                    // xquery/XQueryParser.g:398:123: k= LEAST
                     k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_pm_EmptyOrderDecl1785); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22370,7 +22373,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:400:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
+    // xquery/XQueryParser.g:402:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
     // $ANTLR start "pm_CopyNamespacesDecl"
     pm_CopyNamespacesDecl: function() {
         var retval = new XQueryParser.pm_CopyNamespacesDecl_return();
@@ -22389,8 +22392,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON33_tree=null;
 
         try {
-            // xquery/XQueryParser.g:401:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
-            // xquery/XQueryParser.g:401:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
+            // xquery/XQueryParser.g:403:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
+            // xquery/XQueryParser.g:403:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_CopyNamespacesDecl1820); if (this.state.failed) return retval;
@@ -22467,7 +22470,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:405:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
+    // xquery/XQueryParser.g:407:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
     // $ANTLR start "p_PreserveMode"
     p_PreserveMode: function() {
         var retval = new XQueryParser.p_PreserveMode_return();
@@ -22481,11 +22484,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:406:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             var alt14=2;
             var LA14_0 = this.input.LA(1);
 
@@ -22504,7 +22507,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt14) {
                 case 1 :
-                    // xquery/XQueryParser.g:406:12: k+= PRESERVE
+                    // xquery/XQueryParser.g:408:12: k+= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_p_PreserveMode1865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22517,7 +22520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:406:26: k+= NO_PRESERVE
+                    // xquery/XQueryParser.g:408:26: k+= NO_PRESERVE
                     k=this.match(this.input,NO_PRESERVE,XQueryParser.FOLLOW_NO_PRESERVE_in_p_PreserveMode1871); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22571,7 +22574,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:410:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
+    // xquery/XQueryParser.g:412:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
     // $ANTLR start "p_InheritMode"
     p_InheritMode: function() {
         var retval = new XQueryParser.p_InheritMode_return();
@@ -22585,11 +22588,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:411:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             var alt15=2;
             var LA15_0 = this.input.LA(1);
 
@@ -22608,7 +22611,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt15) {
                 case 1 :
-                    // xquery/XQueryParser.g:411:12: k+= INHERIT
+                    // xquery/XQueryParser.g:413:12: k+= INHERIT
                     k=this.match(this.input,INHERIT,XQueryParser.FOLLOW_INHERIT_in_p_InheritMode1903); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22621,7 +22624,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:411:25: k+= NO_INHERIT
+                    // xquery/XQueryParser.g:413:25: k+= NO_INHERIT
                     k=this.match(this.input,NO_INHERIT,XQueryParser.FOLLOW_NO_INHERIT_in_p_InheritMode1909); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22675,7 +22678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:415:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
+    // xquery/XQueryParser.g:417:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
     // $ANTLR start "pm_DecimalFormatDecl"
     pm_DecimalFormatDecl: function() {
         var retval = new XQueryParser.pm_DecimalFormatDecl_return();
@@ -22695,8 +22698,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON38_tree=null;
 
         try {
-            // xquery/XQueryParser.g:416:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
-            // xquery/XQueryParser.g:416:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
+            // xquery/XQueryParser.g:418:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
+            // xquery/XQueryParser.g:418:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DecimalFormatDecl1948); if (this.state.failed) return retval;
@@ -22707,7 +22710,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:416:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
+            // xquery/XQueryParser.g:418:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
             var alt16=2;
             var LA16_0 = this.input.LA(1);
 
@@ -22726,9 +22729,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt16) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:38: k= DECIMAL_FORMAT p_QName
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:38: k= DECIMAL_FORMAT p_QName
                     k=this.match(this.input,DECIMAL_FORMAT,XQueryParser.FOLLOW_DECIMAL_FORMAT_in_pm_DecimalFormatDecl1956); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22750,9 +22753,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:82: k= DEFAULT k= DECIMAL_FORMAT
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:82: k= DEFAULT k= DECIMAL_FORMAT
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_pm_DecimalFormatDecl1968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22778,7 +22781,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:416:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
+            // xquery/XQueryParser.g:418:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
             loop17:
             do {
                 var alt17=2;
@@ -22791,7 +22794,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt17) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:142: p_DFPropertyName EQUAL p_StringLiteral
+                    // xquery/XQueryParser.g:418:142: p_DFPropertyName EQUAL p_StringLiteral
                     this.pushFollow(XQueryParser.FOLLOW_p_DFPropertyName_in_pm_DecimalFormatDecl1981);
                     p_DFPropertyName35=this.p_DFPropertyName();
 
@@ -22859,7 +22862,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:420:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
+    // xquery/XQueryParser.g:422:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
     // $ANTLR start "p_DFPropertyName"
     p_DFPropertyName: function() {
         var retval = new XQueryParser.p_DFPropertyName_return();
@@ -22872,11 +22875,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:421:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             var alt18=10;
             switch ( this.input.LA(1) ) {
             case DECIMAL_SEPARATOR:
@@ -22919,7 +22922,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt18) {
                 case 1 :
-                    // xquery/XQueryParser.g:421:12: k= DECIMAL_SEPARATOR
+                    // xquery/XQueryParser.g:423:12: k= DECIMAL_SEPARATOR
                     k=this.match(this.input,DECIMAL_SEPARATOR,XQueryParser.FOLLOW_DECIMAL_SEPARATOR_in_p_DFPropertyName2018); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22929,7 +22932,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:421:34: k= GROUPING_SEPARATOR
+                    // xquery/XQueryParser.g:423:34: k= GROUPING_SEPARATOR
                     k=this.match(this.input,GROUPING_SEPARATOR,XQueryParser.FOLLOW_GROUPING_SEPARATOR_in_p_DFPropertyName2024); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22939,7 +22942,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:421:57: k= INFINITY
+                    // xquery/XQueryParser.g:423:57: k= INFINITY
                     k=this.match(this.input,INFINITY,XQueryParser.FOLLOW_INFINITY_in_p_DFPropertyName2030); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22949,7 +22952,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:421:70: k= MINUS_SIGN
+                    // xquery/XQueryParser.g:423:70: k= MINUS_SIGN
                     k=this.match(this.input,MINUS_SIGN,XQueryParser.FOLLOW_MINUS_SIGN_in_p_DFPropertyName2036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22959,7 +22962,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:421:85: k= NAN
+                    // xquery/XQueryParser.g:423:85: k= NAN
                     k=this.match(this.input,NAN,XQueryParser.FOLLOW_NAN_in_p_DFPropertyName2042); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22969,7 +22972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:421:93: k= PERCENT
+                    // xquery/XQueryParser.g:423:93: k= PERCENT
                     k=this.match(this.input,PERCENT,XQueryParser.FOLLOW_PERCENT_in_p_DFPropertyName2048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22979,7 +22982,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:421:105: k= PER_MILLE
+                    // xquery/XQueryParser.g:423:105: k= PER_MILLE
                     k=this.match(this.input,PER_MILLE,XQueryParser.FOLLOW_PER_MILLE_in_p_DFPropertyName2054); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22989,7 +22992,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:421:119: k= ZERO_DIGIT
+                    // xquery/XQueryParser.g:423:119: k= ZERO_DIGIT
                     k=this.match(this.input,ZERO_DIGIT,XQueryParser.FOLLOW_ZERO_DIGIT_in_p_DFPropertyName2060); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -22999,7 +23002,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:421:134: k= DIGIT
+                    // xquery/XQueryParser.g:423:134: k= DIGIT
                     k=this.match(this.input,DIGIT,XQueryParser.FOLLOW_DIGIT_in_p_DFPropertyName2066); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23009,7 +23012,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:421:144: k= PATTERN_SEPARATOR
+                    // xquery/XQueryParser.g:423:144: k= PATTERN_SEPARATOR
                     k=this.match(this.input,PATTERN_SEPARATOR,XQueryParser.FOLLOW_PATTERN_SEPARATOR_in_p_DFPropertyName2072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23060,7 +23063,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:425:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
+    // xquery/XQueryParser.g:427:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
     // $ANTLR start "p_Import"
     p_Import: function() {
         var retval = new XQueryParser.p_Import_return();
@@ -23073,7 +23076,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:426:9: ( pm_SchemaImport | pm_ModuleImport )
+            // xquery/XQueryParser.g:428:9: ( pm_SchemaImport | pm_ModuleImport )
             var alt19=2;
             var LA19_0 = this.input.LA(1);
 
@@ -23103,7 +23106,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt19) {
                 case 1 :
-                    // xquery/XQueryParser.g:426:11: pm_SchemaImport
+                    // xquery/XQueryParser.g:428:11: pm_SchemaImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_SchemaImport_in_p_Import2101);
@@ -23116,7 +23119,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:426:29: pm_ModuleImport
+                    // xquery/XQueryParser.g:428:29: pm_ModuleImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ModuleImport_in_p_Import2105);
@@ -23163,7 +23166,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:430:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:432:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_SchemaImport"
     pm_SchemaImport: function() {
         var retval = new XQueryParser.pm_SchemaImport_return();
@@ -23189,8 +23192,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_SchemaPrefix=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SchemaPrefix");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:431:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:431:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:433:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:433:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_SchemaImport2141); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -23203,7 +23206,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:431:61: (sp= p_SchemaPrefix )?
+            // xquery/XQueryParser.g:433:61: (sp= p_SchemaPrefix )?
             var alt20=2;
             var LA20_0 = this.input.LA(1);
 
@@ -23212,7 +23215,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt20) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:61: sp= p_SchemaPrefix
+                    // xquery/XQueryParser.g:433:61: sp= p_SchemaPrefix
                     this.pushFollow(XQueryParser.FOLLOW_p_SchemaPrefix_in_pm_SchemaImport2153);
                     sp=this.p_SchemaPrefix();
 
@@ -23231,7 +23234,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:431:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:433:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt22=2;
             var LA22_0 = this.input.LA(1);
 
@@ -23240,7 +23243,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt22) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_SchemaImport2163); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -23256,7 +23259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:431:138: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:138: ( COMMA ah+= p_StringLiteral )*
                     loop21:
                     do {
                         var alt21=2;
@@ -23269,7 +23272,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt21) {
                         case 1 :
-                            // xquery/XQueryParser.g:431:139: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:433:139: COMMA ah+= p_StringLiteral
                             COMMA41=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_SchemaImport2172); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA41);
 
@@ -23315,19 +23318,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 432:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+            // 434:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:432:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:434:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(SchemaImport, "SchemaImport"), root_1);
 
-                // xquery/XQueryParser.g:432:35: ^( SchemaPrefix ( $sp)? )
+                // xquery/XQueryParser.g:434:35: ^( SchemaPrefix ( $sp)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(SchemaPrefix, "SchemaPrefix"), root_2);
 
-                // xquery/XQueryParser.g:432:50: ( $sp)?
+                // xquery/XQueryParser.g:434:50: ( $sp)?
                 if ( stream_sp.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_sp.nextTree());
 
@@ -23337,12 +23340,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:432:60: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:434:60: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:432:70: ( $ah)*
+                // xquery/XQueryParser.g:434:70: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -23393,7 +23396,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:436:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
+    // xquery/XQueryParser.g:438:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
     // $ANTLR start "p_SchemaPrefix"
     p_SchemaPrefix: function() {
         var retval = new XQueryParser.p_SchemaPrefix_return();
@@ -23413,7 +23416,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_DEFAULT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token DEFAULT");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:437:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
+            // xquery/XQueryParser.g:439:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
             var alt23=2;
             var LA23_0 = this.input.LA(1);
 
@@ -23432,7 +23435,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt23) {
                 case 1 :
-                    // xquery/XQueryParser.g:437:11: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:439:11: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_SchemaPrefix2252); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -23462,9 +23465,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_nn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nn",nn!=null?nn.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 438:17: -> ^( NamespaceName $nn)
+                    // 440:17: -> ^( NamespaceName $nn)
                     {
-                        // xquery/XQueryParser.g:438:20: ^( NamespaceName $nn)
+                        // xquery/XQueryParser.g:440:20: ^( NamespaceName $nn)
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_1);
@@ -23480,7 +23483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:439:11: k= DEFAULT k= ELEMENT k= NAMESPACE
+                    // xquery/XQueryParser.g:441:11: k= DEFAULT k= ELEMENT k= NAMESPACE
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SchemaPrefix2299); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_DEFAULT.add(k);
 
@@ -23512,7 +23515,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 440:17: -> DefaultElementNamespace
+                    // 442:17: -> DefaultElementNamespace
                     {
                         this.adaptor.addChild(root_0, this.adaptor.create(DefaultElementNamespace, "DefaultElementNamespace"));
 
@@ -23556,7 +23559,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:444:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:446:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_ModuleImport"
     pm_ModuleImport: function() {
         var retval = new XQueryParser.pm_ModuleImport_return();
@@ -23586,8 +23589,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:445:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:445:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:447:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:447:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_ModuleImport2361); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -23600,7 +23603,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:445:59: (k= NAMESPACE nn= p_NCName EQUAL )?
+            // xquery/XQueryParser.g:447:59: (k= NAMESPACE nn= p_NCName EQUAL )?
             var alt24=2;
             var LA24_0 = this.input.LA(1);
 
@@ -23609,7 +23612,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt24) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:60: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:447:60: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_pm_ModuleImport2374); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -23637,7 +23640,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:445:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:447:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt26=2;
             var LA26_0 = this.input.LA(1);
 
@@ -23646,7 +23649,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt26) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_ModuleImport2393); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -23662,7 +23665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:445:167: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:167: ( COMMA ah+= p_StringLiteral )*
                     loop25:
                     do {
                         var alt25=2;
@@ -23675,7 +23678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt25) {
                         case 1 :
-                            // xquery/XQueryParser.g:445:168: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:447:168: COMMA ah+= p_StringLiteral
                             COMMA45=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_ModuleImport2402); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA45);
 
@@ -23721,19 +23724,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 446:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+            // 448:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:446:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:448:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleImport, "ModuleImport"), root_1);
 
-                // xquery/XQueryParser.g:446:35: ^( NamespaceName ( $nn)? )
+                // xquery/XQueryParser.g:448:35: ^( NamespaceName ( $nn)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_2);
 
-                // xquery/XQueryParser.g:446:51: ( $nn)?
+                // xquery/XQueryParser.g:448:51: ( $nn)?
                 if ( stream_nn.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nn.nextTree());
 
@@ -23743,12 +23746,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:446:61: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:448:61: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:446:71: ( $ah)*
+                // xquery/XQueryParser.g:448:71: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -23799,7 +23802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:450:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
+    // xquery/XQueryParser.g:452:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
     // $ANTLR start "pm_NamespaceDecl"
     pm_NamespaceDecl: function() {
         var retval = new XQueryParser.pm_NamespaceDecl_return();
@@ -23823,8 +23826,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:451:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
-            // xquery/XQueryParser.g:451:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:453:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
+            // xquery/XQueryParser.g:453:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_NamespaceDecl2481); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -23870,9 +23873,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 452:17: -> ^( NamespaceDecl $nn $us)
+            // 454:17: -> ^( NamespaceDecl $nn $us)
             {
-                // xquery/XQueryParser.g:452:20: ^( NamespaceDecl $nn $us)
+                // xquery/XQueryParser.g:454:20: ^( NamespaceDecl $nn $us)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecl, "NamespaceDecl"), root_1);
@@ -23921,7 +23924,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:456:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:458:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultNamespaceDecl"
     pm_DefaultNamespaceDecl: function() {
         var retval = new XQueryParser.pm_DefaultNamespaceDecl_return();
@@ -23937,8 +23940,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON50_tree=null;
 
         try {
-            // xquery/XQueryParser.g:457:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:457:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:459:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:459:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultNamespaceDecl2558); if (this.state.failed) return retval;
@@ -23957,7 +23960,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:457:61: (k= ELEMENT | k= FUNCTION )
+            // xquery/XQueryParser.g:459:61: (k= ELEMENT | k= FUNCTION )
             var alt27=2;
             var LA27_0 = this.input.LA(1);
 
@@ -23976,7 +23979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt27) {
                 case 1 :
-                    // xquery/XQueryParser.g:457:62: k= ELEMENT
+                    // xquery/XQueryParser.g:459:62: k= ELEMENT
                     k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_DefaultNamespaceDecl2571); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -23986,7 +23989,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:457:74: k= FUNCTION
+                    // xquery/XQueryParser.g:459:74: k= FUNCTION
                     k=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_pm_DefaultNamespaceDecl2577); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24056,7 +24059,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:461:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
+    // xquery/XQueryParser.g:463:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
     // $ANTLR start "pm_AnnotatedDecl"
     pm_AnnotatedDecl: function() {
         var retval = new XQueryParser.pm_AnnotatedDecl_return();
@@ -24073,8 +24076,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON53_tree=null;
 
         try {
-            // xquery/XQueryParser.g:462:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
-            // xquery/XQueryParser.g:462:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
+            // xquery/XQueryParser.g:464:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
+            // xquery/XQueryParser.g:464:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_AnnotatedDecl2618); if (this.state.failed) return retval;
@@ -24085,7 +24088,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:462:36: ( p_Annotation )*
+            // xquery/XQueryParser.g:464:36: ( p_Annotation )*
             loop28:
             do {
                 var alt28=2;
@@ -24098,7 +24101,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt28) {
                 case 1 :
-                    // xquery/XQueryParser.g:462:36: p_Annotation
+                    // xquery/XQueryParser.g:464:36: p_Annotation
                     this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_pm_AnnotatedDecl2622);
                     p_Annotation51=this.p_Annotation();
 
@@ -24161,7 +24164,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:464:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
+    // xquery/XQueryParser.g:466:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
     // $ANTLR start "pg_AnnotatedDecl"
     pg_AnnotatedDecl: function() {
         var retval = new XQueryParser.pg_AnnotatedDecl_return();
@@ -24177,7 +24180,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:465:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
+            // xquery/XQueryParser.g:467:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
             var alt29=5;
             var LA29_0 = this.input.LA(1);
 
@@ -24208,7 +24211,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt29) {
                 case 1 :
-                    // xquery/XQueryParser.g:465:11: p_VarDecl
+                    // xquery/XQueryParser.g:467:11: p_VarDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_VarDecl_in_pg_AnnotatedDecl2651);
@@ -24221,7 +24224,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:466:11: pm_FunctionDecl
+                    // xquery/XQueryParser.g:468:11: pm_FunctionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_FunctionDecl_in_pg_AnnotatedDecl2663);
@@ -24234,7 +24237,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:467:11: {...}? => p_CollectionDecl
+                    // xquery/XQueryParser.g:469:11: {...}? => p_CollectionDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24251,7 +24254,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:468:11: {...}? => p_IndexDecl
+                    // xquery/XQueryParser.g:470:11: {...}? => p_IndexDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24268,7 +24271,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:469:11: {...}? => p_ICDecl
+                    // xquery/XQueryParser.g:471:11: {...}? => p_ICDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -24319,7 +24322,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:473:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
+    // xquery/XQueryParser.g:475:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
     // $ANTLR start "p_Annotation"
     p_Annotation: function() {
         var retval = new XQueryParser.p_Annotation_return();
@@ -24341,8 +24344,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var RPAREN65_tree=null;
 
         try {
-            // xquery/XQueryParser.g:474:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
-            // xquery/XQueryParser.g:474:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
+            // xquery/XQueryParser.g:476:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             root_0 = this.adaptor.nil();
 
             ANN_PERCENT59=this.match(this.input,ANN_PERCENT,XQueryParser.FOLLOW_ANN_PERCENT_in_p_Annotation2734); if (this.state.failed) return retval;
@@ -24356,7 +24359,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName60.getTree());
-            // xquery/XQueryParser.g:474:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             var alt31=2;
             var LA31_0 = this.input.LA(1);
 
@@ -24365,7 +24368,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt31) {
                 case 1 :
-                    // xquery/XQueryParser.g:474:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
+                    // xquery/XQueryParser.g:476:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
                     LPAREN61=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_Annotation2739); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     LPAREN61_tree = this.adaptor.create(LPAREN61);
@@ -24377,7 +24380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal62.getTree());
-                    // xquery/XQueryParser.g:474:49: ( COMMA p_Literal )*
+                    // xquery/XQueryParser.g:476:49: ( COMMA p_Literal )*
                     loop30:
                     do {
                         var alt30=2;
@@ -24390,7 +24393,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt30) {
                         case 1 :
-                            // xquery/XQueryParser.g:474:50: COMMA p_Literal
+                            // xquery/XQueryParser.g:476:50: COMMA p_Literal
                             COMMA63=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Annotation2744); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             COMMA63_tree = this.adaptor.create(COMMA63);
@@ -24458,7 +24461,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:478:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
+    // xquery/XQueryParser.g:480:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
     // $ANTLR start "p_VarDecl"
     p_VarDecl: function() {
         var retval = new XQueryParser.p_VarDecl_return();
@@ -24488,8 +24491,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_VarDefaultValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarDefaultValue");
         var stream_p_VarValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarValue");
         try {
-            // xquery/XQueryParser.g:479:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
-            // xquery/XQueryParser.g:479:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
+            // xquery/XQueryParser.g:481:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDecl2780); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_VARIABLE.add(k);
 
@@ -24508,7 +24511,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:479:86: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:481:86: (td= p_TypeDeclaration )?
             var alt32=2;
             var LA32_0 = this.input.LA(1);
 
@@ -24517,7 +24520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt32) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:86: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:481:86: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDecl2796);
                     td=this.p_TypeDeclaration();
 
@@ -24530,7 +24533,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:479:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             var alt34=2;
             var LA34_0 = this.input.LA(1);
 
@@ -24549,9 +24552,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt34) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:108: BIND vv= p_VarValue
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:108: BIND vv= p_VarValue
                     BIND66=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2801); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_BIND.add(BIND66);
 
@@ -24568,16 +24571,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_p_VarDecl2813); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:479:157: ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:157: ( BIND vdv= p_VarDefaultValue )?
                     var alt33=2;
                     var LA33_0 = this.input.LA(1);
 
@@ -24586,7 +24589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt33) {
                         case 1 :
-                            // xquery/XQueryParser.g:479:158: BIND vdv= p_VarDefaultValue
+                            // xquery/XQueryParser.g:481:158: BIND vdv= p_VarDefaultValue
                             BIND67=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2818); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_BIND.add(BIND67);
 
@@ -24614,7 +24617,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: vv, vdv, qn, td
+            // elements: td, vv, vdv, qn
             // token labels: 
             // rule labels: qn, vv, retval, vdv, td
             // token list labels: 
@@ -24628,20 +24631,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 480:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+            // 482:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
             {
-                // xquery/XQueryParser.g:480:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+                // xquery/XQueryParser.g:482:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VarDecl, "VarDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:480:34: ^( VarType ( $td)? )
+                // xquery/XQueryParser.g:482:34: ^( VarType ( $td)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarType, "VarType"), root_2);
 
-                // xquery/XQueryParser.g:480:44: ( $td)?
+                // xquery/XQueryParser.g:482:44: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_td.nextTree());
 
@@ -24650,23 +24653,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:480:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
+                // xquery/XQueryParser.g:482:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarValue, "VarValue"), root_2);
 
-                // xquery/XQueryParser.g:480:61: ( $vv)?
+                // xquery/XQueryParser.g:482:61: ( $vv)?
                 if ( stream_vv.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_vv.nextTree());
 
                 }
                 stream_vv.reset();
-                // xquery/XQueryParser.g:480:66: ^( VarDefaultValue ( $vdv)? )
+                // xquery/XQueryParser.g:482:66: ^( VarDefaultValue ( $vdv)? )
                 {
                 var root_3 = this.adaptor.nil();
                 root_3 = this.adaptor.becomeRoot(this.adaptor.create(VarDefaultValue, "VarDefaultValue"), root_3);
 
-                // xquery/XQueryParser.g:480:84: ( $vdv)?
+                // xquery/XQueryParser.g:482:84: ( $vdv)?
                 if ( stream_vdv.hasNext() ) {
                     this.adaptor.addChild(root_3, stream_vdv.nextTree());
 
@@ -24720,7 +24723,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:484:1: p_VarValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:486:1: p_VarValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarValue"
     p_VarValue: function() {
         var retval = new XQueryParser.p_VarValue_return();
@@ -24732,8 +24735,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:485:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:485:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:487:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:487:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarValue2901);
@@ -24778,7 +24781,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:489:1: p_VarDefaultValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:491:1: p_VarDefaultValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarDefaultValue"
     p_VarDefaultValue: function() {
         var retval = new XQueryParser.p_VarDefaultValue_return();
@@ -24790,8 +24793,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:490:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:490:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:492:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:492:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDefaultValue2928);
@@ -24836,7 +24839,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:494:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:496:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
     // $ANTLR start "pm_ContextItemDecl"
     pm_ContextItemDecl: function() {
         var retval = new XQueryParser.pm_ContextItemDecl_return();
@@ -24858,8 +24861,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON75_tree=null;
 
         try {
-            // xquery/XQueryParser.g:495:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
-            // xquery/XQueryParser.g:495:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:497:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
+            // xquery/XQueryParser.g:497:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ContextItemDecl2957); if (this.state.failed) return retval;
@@ -24886,7 +24889,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:495:83: (k= AS p_ItemType )?
+            // xquery/XQueryParser.g:497:83: (k= AS p_ItemType )?
             var alt35=2;
             var LA35_0 = this.input.LA(1);
 
@@ -24895,7 +24898,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt35) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:84: k= AS p_ItemType
+                    // xquery/XQueryParser.g:497:84: k= AS p_ItemType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_ContextItemDecl2976); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24916,7 +24919,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:495:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:497:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
             var alt37=2;
             var LA37_0 = this.input.LA(1);
 
@@ -24935,9 +24938,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt37) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:119: BIND p_VarValue
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:119: BIND p_VarValue
                     BIND71=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl2986); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     BIND71_tree = this.adaptor.create(BIND71);
@@ -24956,9 +24959,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_ContextItemDecl2996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -24967,7 +24970,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:495:165: ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:165: ( BIND p_VarDefaultValue )?
                     var alt36=2;
                     var LA36_0 = this.input.LA(1);
 
@@ -24976,7 +24979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt36) {
                         case 1 :
-                            // xquery/XQueryParser.g:495:166: BIND p_VarDefaultValue
+                            // xquery/XQueryParser.g:497:166: BIND p_VarDefaultValue
                             BIND73=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl3001); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             BIND73_tree = this.adaptor.create(BIND73);
@@ -25044,7 +25047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:500:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
+    // xquery/XQueryParser.g:502:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
     // $ANTLR start "pm_FunctionDecl"
     pm_FunctionDecl: function() {
         var retval = new XQueryParser.pm_FunctionDecl_return();
@@ -25080,9 +25083,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_FQName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_FQName");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:501:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )?
+            // xquery/XQueryParser.g:503:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )?
             var alt38=2;
             var LA38_0 = this.input.LA(1);
 
@@ -25091,7 +25094,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt38) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:12: {...}? =>k= UPDATING
+                    // xquery/XQueryParser.g:503:12: {...}? =>k= UPDATING
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "pm_FunctionDecl", "this.lc(XQU)");
@@ -25123,7 +25126,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             LPAREN76=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_pm_FunctionDecl3058); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN76);
 
-            // xquery/XQueryParser.g:501:106: (pl= p_ParamList )?
+            // xquery/XQueryParser.g:503:106: (pl= p_ParamList )?
             var alt39=2;
             var LA39_0 = this.input.LA(1);
 
@@ -25132,7 +25135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt39) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:106: pl= p_ParamList
+                    // xquery/XQueryParser.g:503:106: pl= p_ParamList
                     this.pushFollow(XQueryParser.FOLLOW_p_ParamList_in_pm_FunctionDecl3062);
                     pl=this.p_ParamList();
 
@@ -25148,7 +25151,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             RPAREN77=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_pm_FunctionDecl3065); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN77);
 
-            // xquery/XQueryParser.g:501:127: (k= AS st= p_SequenceType )?
+            // xquery/XQueryParser.g:503:127: (k= AS st= p_SequenceType )?
             var alt40=2;
             var LA40_0 = this.input.LA(1);
 
@@ -25157,7 +25160,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt40) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:128: k= AS st= p_SequenceType
+                    // xquery/XQueryParser.g:503:128: k= AS st= p_SequenceType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_FunctionDecl3070); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AS.add(k);
 
@@ -25176,7 +25179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:501:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
             var alt41=2;
             var LA41_0 = this.input.LA(1);
 
@@ -25195,7 +25198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt41) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
+                    // xquery/XQueryParser.g:503:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
                     LBRACKET78=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_FunctionDecl3081); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET78);
 
@@ -25212,7 +25215,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:501:221: k= EXTERNAL
+                    // xquery/XQueryParser.g:503:221: k= EXTERNAL
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_FunctionDecl3093); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
@@ -25228,34 +25231,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: st, pl, qn, soe
+            // elements: pl, soe, qn, st
             // token labels: 
-            // rule labels: soe, qn, retval, pl, st
+            // rule labels: qn, soe, retval, pl, st
             // token list labels: 
             // rule list labels: 
             if ( this.state.backtracking===0 ) {
             retval.tree = root_0;
-            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_qn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token qn",qn!=null?qn.tree:null);
+            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_pl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token pl",pl!=null?pl.tree:null);
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 502:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+            // 504:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
             {
-                // xquery/XQueryParser.g:502:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+                // xquery/XQueryParser.g:504:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(FunctionDecl, "FunctionDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:502:39: ^( ParamList ( $pl)? )
+                // xquery/XQueryParser.g:504:39: ^( ParamList ( $pl)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ParamList, "ParamList"), root_2);
 
-                // xquery/XQueryParser.g:502:51: ( $pl)?
+                // xquery/XQueryParser.g:504:51: ( $pl)?
                 if ( stream_pl.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pl.nextTree());
 
@@ -25264,12 +25267,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:57: ^( ReturnType ( $st)? )
+                // xquery/XQueryParser.g:504:57: ^( ReturnType ( $st)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ReturnType, "ReturnType"), root_2);
 
-                // xquery/XQueryParser.g:502:70: ( $st)?
+                // xquery/XQueryParser.g:504:70: ( $st)?
                 if ( stream_st.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_st.nextTree());
 
@@ -25278,7 +25281,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:76: ( $soe)?
+                // xquery/XQueryParser.g:504:76: ( $soe)?
                 if ( stream_soe.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_soe.nextTree());
 
@@ -25326,7 +25329,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:506:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
+    // xquery/XQueryParser.g:508:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
     // $ANTLR start "p_ParamList"
     p_ParamList: function() {
         var retval = new XQueryParser.p_ParamList_return();
@@ -25341,8 +25344,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_COMMA=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COMMA");
         var stream_p_Param=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Param");
         try {
-            // xquery/XQueryParser.g:507:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
-            // xquery/XQueryParser.g:507:11: p+= p_Param ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
+            // xquery/XQueryParser.g:509:11: p+= p_Param ( COMMA p+= p_Param )*
             this.pushFollow(XQueryParser.FOLLOW_p_Param_in_p_ParamList3170);
             p=this.p_Param();
 
@@ -25352,7 +25355,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_p)) list_p = [];
             list_p.push(p.getTree());
 
-            // xquery/XQueryParser.g:507:22: ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:22: ( COMMA p+= p_Param )*
             loop42:
             do {
                 var alt42=2;
@@ -25365,7 +25368,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt42) {
                 case 1 :
-                    // xquery/XQueryParser.g:507:23: COMMA p+= p_Param
+                    // xquery/XQueryParser.g:509:23: COMMA p+= p_Param
                     COMMA80=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ParamList3173); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA80);
 
@@ -25400,7 +25403,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_p=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token p",list_p);
             root_0 = this.adaptor.nil();
-            // 508:17: -> ( $p)+
+            // 510:17: -> ( $p)+
             {
                 if ( !(stream_p.hasNext()) ) {
                     throw new org.antlr.runtime.tree.RewriteEarlyExitException();
@@ -25449,7 +25452,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:512:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
+    // xquery/XQueryParser.g:514:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
     // $ANTLR start "p_Param"
     p_Param: function() {
         var retval = new XQueryParser.p_Param_return();
@@ -25466,8 +25469,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_TypeDeclaration=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_TypeDeclaration");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:513:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
-            // xquery/XQueryParser.g:513:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
+            // xquery/XQueryParser.g:515:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
             d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_Param3237); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DOLLAR.add(d);
 
@@ -25480,7 +25483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:513:60: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:60: (td= p_TypeDeclaration )?
             var alt43=2;
             var LA43_0 = this.input.LA(1);
 
@@ -25489,7 +25492,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt43) {
                 case 1 :
-                    // xquery/XQueryParser.g:513:60: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:515:60: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_Param3247);
                     td=this.p_TypeDeclaration();
 
@@ -25505,7 +25508,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: qn, td
+            // elements: td, qn
             // token labels: 
             // rule labels: qn, retval, td
             // token list labels: 
@@ -25517,15 +25520,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 514:17: -> ^( Param $qn ( $td)? )
+            // 516:17: -> ^( Param $qn ( $td)? )
             {
-                // xquery/XQueryParser.g:514:20: ^( Param $qn ( $td)? )
+                // xquery/XQueryParser.g:516:20: ^( Param $qn ( $td)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Param, "Param"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:514:32: ( $td)?
+                // xquery/XQueryParser.g:516:32: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_td.nextTree());
 
@@ -25573,7 +25576,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:518:1: pm_FunctionBody : p_EnclosedExpr ;
+    // xquery/XQueryParser.g:520:1: pm_FunctionBody : p_EnclosedExpr ;
     // $ANTLR start "pm_FunctionBody"
     pm_FunctionBody: function() {
         var retval = new XQueryParser.pm_FunctionBody_return();
@@ -25585,8 +25588,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:519:9: ( p_EnclosedExpr )
-            // xquery/XQueryParser.g:519:11: p_EnclosedExpr
+            // xquery/XQueryParser.g:521:9: ( p_EnclosedExpr )
+            // xquery/XQueryParser.g:521:11: p_EnclosedExpr
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_EnclosedExpr_in_pm_FunctionBody3303);
@@ -25631,7 +25634,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:524:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
+    // xquery/XQueryParser.g:526:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
     // $ANTLR start "p_EnclosedExpr"
     p_EnclosedExpr: function() {
         var retval = new XQueryParser.p_EnclosedExpr_return();
@@ -25649,8 +25652,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_RBRACKET=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RBRACKET");
         var stream_p_Expr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Expr");
         try {
-            // xquery/XQueryParser.g:525:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
-            // xquery/XQueryParser.g:525:11: LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:527:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
+            // xquery/XQueryParser.g:527:11: LBRACKET p_Expr[true,true] RBRACKET
             LBRACKET82=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_EnclosedExpr3330); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET82);
 
@@ -25676,9 +25679,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 526:17: -> ^( EnclosedExpr p_Expr )
+            // 528:17: -> ^( EnclosedExpr p_Expr )
             {
-                // xquery/XQueryParser.g:526:20: ^( EnclosedExpr p_Expr )
+                // xquery/XQueryParser.g:528:20: ^( EnclosedExpr p_Expr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(EnclosedExpr, "EnclosedExpr"), root_1);
@@ -25726,7 +25729,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:530:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:532:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_OptionDecl"
     pm_OptionDecl: function() {
         var retval = new XQueryParser.pm_OptionDecl_return();
@@ -25743,8 +25746,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON87_tree=null;
 
         try {
-            // xquery/XQueryParser.g:531:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:531:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:533:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:533:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OptionDecl3387); if (this.state.failed) return retval;
@@ -25816,7 +25819,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
+    // xquery/XQueryParser.g:537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
     // $ANTLR start "pm_QueryBody"
     pm_QueryBody: function() {
         var retval = new XQueryParser.pm_QueryBody_return();
@@ -25829,12 +25832,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:536:9: ({...}? => p_Program | p_Expr[true,true] )
+            // xquery/XQueryParser.g:538:9: ({...}? => p_Program | p_Expr[true,true] )
             var alt44=2;
             alt44 = this.dfa44.predict(this.input);
             switch (alt44) {
                 case 1 :
-                    // xquery/XQueryParser.g:536:11: {...}? => p_Program
+                    // xquery/XQueryParser.g:538:11: {...}? => p_Program
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQS))) ) {
@@ -25851,7 +25854,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:537:11: p_Expr[true,true]
+                    // xquery/XQueryParser.g:539:11: p_Expr[true,true]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_QueryBody3442);
@@ -25898,7 +25901,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:547:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
+    // xquery/XQueryParser.g:549:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
     // $ANTLR start "p_Expr"
     p_Expr: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Expr_return();
@@ -25913,8 +25916,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var COMMA90_tree=null;
 
         try {
-            // xquery/XQueryParser.g:548:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
-            // xquery/XQueryParser.g:548:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:550:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
+            // xquery/XQueryParser.g:550:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Expr3478);
@@ -25926,7 +25929,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (!allowConcat) throw new Exception(); 
             }
-            // xquery/XQueryParser.g:549:11: ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:551:11: ( COMMA p_ExprSingle[$strict] )*
             loop45:
             do {
                 var alt45=2;
@@ -25939,7 +25942,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt45) {
                 case 1 :
-                    // xquery/XQueryParser.g:549:12: COMMA p_ExprSingle[$strict]
+                    // xquery/XQueryParser.g:551:12: COMMA p_ExprSingle[$strict]
                     COMMA90=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Expr3494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     COMMA90_tree = this.adaptor.create(COMMA90);
@@ -26006,7 +26009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
+    // xquery/XQueryParser.g:573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
     // $ANTLR start "p_ExprSingle"
     p_ExprSingle: function(strict) {
         var retval = new XQueryParser.p_ExprSingle_return();
@@ -26023,12 +26026,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:572:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
+            // xquery/XQueryParser.g:574:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
             var alt46=6;
             alt46 = this.dfa46.predict(this.input);
             switch (alt46) {
                 case 1 :
-                    // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
+                    // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_FLWORHybrid_in_p_ExprSingle3563);
@@ -26041,7 +26044,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:573:11: ( IF LPAREN )=> p_IfHybrid[$strict]
+                    // xquery/XQueryParser.g:575:11: ( IF LPAREN )=> p_IfHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_IfHybrid_in_p_ExprSingle3593);
@@ -26054,7 +26057,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
+                    // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_SwitchHybrid_in_p_ExprSingle3619);
@@ -26067,7 +26070,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
+                    // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeswitchHybrid_in_p_ExprSingle3641);
@@ -26080,7 +26083,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
+                    // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TryCatchHybrid_in_p_ExprSingle3668);
@@ -26093,7 +26096,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:577:11: p_ExprSimple
+                    // xquery/XQueryParser.g:579:11: p_ExprSimple
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ExprSingle3681);
@@ -26140,7 +26143,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:581:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
+    // xquery/XQueryParser.g:583:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
     // $ANTLR start "p_FLWORHybrid"
     p_FLWORHybrid: function(strict) {
         var retval = new XQueryParser.p_FLWORHybrid_return();
@@ -26154,8 +26157,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:582:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
-            // xquery/XQueryParser.g:582:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
+            // xquery/XQueryParser.g:584:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
+            // xquery/XQueryParser.g:584:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORHybrid3708);
@@ -26164,7 +26167,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause98.getTree());
-            // xquery/XQueryParser.g:582:27: ( p_IntermediateClause )*
+            // xquery/XQueryParser.g:584:27: ( p_IntermediateClause )*
             loop47:
             do {
                 var alt47=2;
@@ -26177,7 +26180,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt47) {
                 case 1 :
-                    // xquery/XQueryParser.g:582:27: p_IntermediateClause
+                    // xquery/XQueryParser.g:584:27: p_IntermediateClause
                     this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORHybrid3710);
                     p_IntermediateClause99=this.p_IntermediateClause();
 
@@ -26235,7 +26238,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:586:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
+    // xquery/XQueryParser.g:588:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
     // $ANTLR start "p_InitialClause"
     p_InitialClause: function() {
         var retval = new XQueryParser.p_InitialClause_return();
@@ -26249,7 +26252,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:587:9: ( p_ForClause | p_LetClause | p_WindowClause )
+            // xquery/XQueryParser.g:589:9: ( p_ForClause | p_LetClause | p_WindowClause )
             var alt48=3;
             var LA48_0 = this.input.LA(1);
 
@@ -26282,7 +26285,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt48) {
                 case 1 :
-                    // xquery/XQueryParser.g:587:11: p_ForClause
+                    // xquery/XQueryParser.g:589:11: p_ForClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ForClause_in_p_InitialClause3740);
@@ -26295,7 +26298,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:587:25: p_LetClause
+                    // xquery/XQueryParser.g:589:25: p_LetClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_LetClause_in_p_InitialClause3744);
@@ -26308,7 +26311,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:587:39: p_WindowClause
+                    // xquery/XQueryParser.g:589:39: p_WindowClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WindowClause_in_p_InitialClause3748);
@@ -26355,7 +26358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:591:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
+    // xquery/XQueryParser.g:593:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
     // $ANTLR start "p_IntermediateClause"
     p_IntermediateClause: function() {
         var retval = new XQueryParser.p_IntermediateClause_return();
@@ -26371,7 +26374,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:592:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
+            // xquery/XQueryParser.g:594:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
             var alt49=5;
             switch ( this.input.LA(1) ) {
             case FOR:
@@ -26401,7 +26404,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt49) {
                 case 1 :
-                    // xquery/XQueryParser.g:592:11: p_InitialClause
+                    // xquery/XQueryParser.g:594:11: p_InitialClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_IntermediateClause3774);
@@ -26414,7 +26417,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:592:29: p_WhereClause
+                    // xquery/XQueryParser.g:594:29: p_WhereClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WhereClause_in_p_IntermediateClause3778);
@@ -26427,7 +26430,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:592:45: p_GroupByClause
+                    // xquery/XQueryParser.g:594:45: p_GroupByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_GroupByClause_in_p_IntermediateClause3782);
@@ -26440,7 +26443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:592:63: p_OrderByClause
+                    // xquery/XQueryParser.g:594:63: p_OrderByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_OrderByClause_in_p_IntermediateClause3786);
@@ -26453,7 +26456,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:592:81: p_CountClause
+                    // xquery/XQueryParser.g:594:81: p_CountClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_CountClause_in_p_IntermediateClause3790);
@@ -26500,7 +26503,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:596:1: p_StringConcatExpr : p_RangeExpr ( CONCAT p_RangeExpr )* ;
+    // xquery/XQueryParser.g:598:1: p_StringConcatExpr : p_RangeExpr (o= CONCAT p_RangeExpr )* ;
     // $ANTLR start "p_StringConcatExpr"
     p_StringConcatExpr: function() {
         var retval = new XQueryParser.p_StringConcatExpr_return();
@@ -26508,15 +26511,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CONCAT110 = null;
+        var o = null;
          var p_RangeExpr109 = null;
-         var p_RangeExpr111 = null;
+         var p_RangeExpr110 = null;
 
-        var CONCAT110_tree=null;
+        var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:597:4: ( p_RangeExpr ( CONCAT p_RangeExpr )* )
-            // xquery/XQueryParser.g:597:6: p_RangeExpr ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:4: ( p_RangeExpr (o= CONCAT p_RangeExpr )* )
+            // xquery/XQueryParser.g:599:6: p_RangeExpr (o= CONCAT p_RangeExpr )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811);
@@ -26525,7 +26528,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr109.getTree());
-            // xquery/XQueryParser.g:597:18: ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:18: (o= CONCAT p_RangeExpr )*
             loop50:
             do {
                 var alt50=2;
@@ -26538,18 +26541,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt50) {
                 case 1 :
-                    // xquery/XQueryParser.g:597:20: CONCAT p_RangeExpr
-                    CONCAT110=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3815); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:599:20: o= CONCAT p_RangeExpr
+                    o=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3817); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CONCAT110_tree = this.adaptor.create(CONCAT110);
-                    this.adaptor.addChild(root_0, CONCAT110_tree);
+                    o_tree = this.adaptor.create(o);
+                    this.adaptor.addChild(root_0, o_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817);
-                    p_RangeExpr111=this.p_RangeExpr();
+                    if ( this.state.backtracking===0 ) {
+                       this.ao(o); 
+                    }
+                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821);
+                    p_RangeExpr110=this.p_RangeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr111.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr110.getTree());
 
 
                     break;
@@ -26595,7 +26601,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:602:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
+    // xquery/XQueryParser.g:604:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
     // $ANTLR start "p_ForClause"
     p_ForClause: function() {
         var retval = new XQueryParser.p_ForClause_return();
@@ -26604,19 +26610,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA113 = null;
-         var p_ForBinding112 = null;
-         var p_ForBinding114 = null;
+        var COMMA112 = null;
+         var p_ForBinding111 = null;
+         var p_ForBinding113 = null;
 
         var k_tree=null;
-        var COMMA113_tree=null;
+        var COMMA112_tree=null;
 
         try {
-            // xquery/XQueryParser.g:603:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
-            // xquery/XQueryParser.g:603:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
+            // xquery/XQueryParser.g:605:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
+            // xquery/XQueryParser.g:605:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3844); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3848); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26624,13 +26630,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3848);
-            p_ForBinding112=this.p_ForBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3852);
+            p_ForBinding111=this.p_ForBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding112.getTree());
-            // xquery/XQueryParser.g:603:45: ( COMMA p_ForBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding111.getTree());
+            // xquery/XQueryParser.g:605:45: ( COMMA p_ForBinding )*
             loop51:
             do {
                 var alt51=2;
@@ -26643,18 +26649,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt51) {
                 case 1 :
-                    // xquery/XQueryParser.g:603:46: COMMA p_ForBinding
-                    COMMA113=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3851); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:605:46: COMMA p_ForBinding
+                    COMMA112=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3855); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA113_tree = this.adaptor.create(COMMA113);
-                    this.adaptor.addChild(root_0, COMMA113_tree);
+                    COMMA112_tree = this.adaptor.create(COMMA112);
+                    this.adaptor.addChild(root_0, COMMA112_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3853);
-                    p_ForBinding114=this.p_ForBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3857);
+                    p_ForBinding113=this.p_ForBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding114.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding113.getTree());
 
 
                     break;
@@ -26700,7 +26706,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:607:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:609:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
     // $ANTLR start "p_ForBinding"
     p_ForBinding: function() {
         var retval = new XQueryParser.p_ForBinding_return();
@@ -26711,26 +26717,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var s = null;
         var k = null;
          var v = null;
-         var p_TypeDeclaration115 = null;
-         var p_AllowingEmpty116 = null;
-         var p_PositionalVar117 = null;
-         var p_FTScoreVar118 = null;
-         var p_ExprSingle119 = null;
+         var p_TypeDeclaration114 = null;
+         var p_AllowingEmpty115 = null;
+         var p_PositionalVar116 = null;
+         var p_FTScoreVar117 = null;
+         var p_ExprSingle118 = null;
 
         var s_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:608:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:608:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
+            // xquery/XQueryParser.g:610:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:610:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3883); if (this.state.failed) return retval;
+            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3887); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             s_tree = this.adaptor.create(s);
             this.adaptor.addChild(root_0, s_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3887);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3891);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -26739,7 +26745,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(s, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:608:58: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:610:58: ( p_TypeDeclaration )?
             var alt52=2;
             var LA52_0 = this.input.LA(1);
 
@@ -26748,20 +26754,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt52) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:58: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3891);
-                    p_TypeDeclaration115=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:610:58: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3895);
+                    p_TypeDeclaration114=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration115.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration114.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:77: ( p_AllowingEmpty )?
+            // xquery/XQueryParser.g:610:77: ( p_AllowingEmpty )?
             var alt53=2;
             var LA53_0 = this.input.LA(1);
 
@@ -26770,20 +26776,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt53) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:77: p_AllowingEmpty
-                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3894);
-                    p_AllowingEmpty116=this.p_AllowingEmpty();
+                    // xquery/XQueryParser.g:610:77: p_AllowingEmpty
+                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3898);
+                    p_AllowingEmpty115=this.p_AllowingEmpty();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty116.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty115.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:94: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:610:94: ( p_PositionalVar )?
             var alt54=2;
             var LA54_0 = this.input.LA(1);
 
@@ -26792,20 +26798,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt54) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:94: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3897);
-                    p_PositionalVar117=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:610:94: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3901);
+                    p_PositionalVar116=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar117.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar116.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:111: ( p_FTScoreVar )?
+            // xquery/XQueryParser.g:610:111: ( p_FTScoreVar )?
             var alt55=2;
             var LA55_0 = this.input.LA(1);
 
@@ -26814,20 +26820,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt55) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:111: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3900);
-                    p_FTScoreVar118=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:610:111: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3904);
+                    p_FTScoreVar117=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar118.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar117.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3905); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3909); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26835,12 +26841,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3909);
-            p_ExprSingle119=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3913);
+            p_ExprSingle118=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle119.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle118.getTree());
 
 
 
@@ -26877,7 +26883,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:612:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
+    // xquery/XQueryParser.g:614:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
     // $ANTLR start "p_AllowingEmpty"
     p_AllowingEmpty: function() {
         var retval = new XQueryParser.p_AllowingEmpty_return();
@@ -26890,11 +26896,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:613:9: (k= ALLOWING k= EMPTY )
-            // xquery/XQueryParser.g:613:11: k= ALLOWING k= EMPTY
+            // xquery/XQueryParser.g:615:9: (k= ALLOWING k= EMPTY )
+            // xquery/XQueryParser.g:615:11: k= ALLOWING k= EMPTY
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3938); if (this.state.failed) return retval;
+            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3942); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26902,7 +26908,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3944); if (this.state.failed) return retval;
+            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3948); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26946,7 +26952,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:617:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:619:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_PositionalVar"
     p_PositionalVar: function() {
         var retval = new XQueryParser.p_PositionalVar_return();
@@ -26962,11 +26968,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:618:9: (k= AT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:618:11: k= AT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:620:9: (k= AT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:620:11: k= AT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3974); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3978); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26974,12 +26980,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3980); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3984); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3984);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3988);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27024,7 +27030,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:622:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
+    // xquery/XQueryParser.g:624:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
     // $ANTLR start "p_LetClause"
     p_LetClause: function() {
         var retval = new XQueryParser.p_LetClause_return();
@@ -27033,19 +27039,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA121 = null;
-         var p_LetBinding120 = null;
-         var p_LetBinding122 = null;
+        var COMMA120 = null;
+         var p_LetBinding119 = null;
+         var p_LetBinding121 = null;
 
         var k_tree=null;
-        var COMMA121_tree=null;
+        var COMMA120_tree=null;
 
         try {
-            // xquery/XQueryParser.g:623:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
-            // xquery/XQueryParser.g:623:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
+            // xquery/XQueryParser.g:625:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
+            // xquery/XQueryParser.g:625:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4014); if (this.state.failed) return retval;
+            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4018); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27053,13 +27059,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4018);
-            p_LetBinding120=this.p_LetBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4022);
+            p_LetBinding119=this.p_LetBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding120.getTree());
-            // xquery/XQueryParser.g:623:45: ( COMMA p_LetBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding119.getTree());
+            // xquery/XQueryParser.g:625:45: ( COMMA p_LetBinding )*
             loop56:
             do {
                 var alt56=2;
@@ -27072,18 +27078,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt56) {
                 case 1 :
-                    // xquery/XQueryParser.g:623:46: COMMA p_LetBinding
-                    COMMA121=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4021); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:625:46: COMMA p_LetBinding
+                    COMMA120=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4025); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA121_tree = this.adaptor.create(COMMA121);
-                    this.adaptor.addChild(root_0, COMMA121_tree);
+                    COMMA120_tree = this.adaptor.create(COMMA120);
+                    this.adaptor.addChild(root_0, COMMA120_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4023);
-                    p_LetBinding122=this.p_LetBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4027);
+                    p_LetBinding121=this.p_LetBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding122.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding121.getTree());
 
 
                     break;
@@ -27129,7 +27135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:628:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:630:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
     // $ANTLR start "p_LetBinding"
     p_LetBinding: function() {
         var retval = new XQueryParser.p_LetBinding_return();
@@ -27138,21 +27144,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND125 = null;
+        var BIND124 = null;
          var v = null;
-         var p_TypeDeclaration123 = null;
-         var p_FTScoreVar124 = null;
-         var p_ExprSingle126 = null;
+         var p_TypeDeclaration122 = null;
+         var p_FTScoreVar123 = null;
+         var p_ExprSingle125 = null;
 
         var d_tree=null;
-        var BIND125_tree=null;
+        var BIND124_tree=null;
 
         try {
-            // xquery/XQueryParser.g:629:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
+            // xquery/XQueryParser.g:631:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
             var alt58=2;
             var LA58_0 = this.input.LA(1);
 
@@ -27171,15 +27177,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt58) {
                 case 1 :
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4057); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4061); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4061);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4065);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -27188,7 +27194,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(d, (v?v.stop:null));
                     }
-                    // xquery/XQueryParser.g:629:59: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:631:59: ( p_TypeDeclaration )?
                     var alt57=2;
                     var LA57_0 = this.input.LA(1);
 
@@ -27197,13 +27203,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt57) {
                         case 1 :
-                            // xquery/XQueryParser.g:629:59: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4065);
-                            p_TypeDeclaration123=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:631:59: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4069);
+                            p_TypeDeclaration122=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration123.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration122.getTree());
 
 
                             break;
@@ -27217,30 +27223,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:629:81: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4071);
-                    p_FTScoreVar124=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:631:81: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4075);
+                    p_FTScoreVar123=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar124.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar123.getTree());
 
 
                     break;
 
             }
 
-            BIND125=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4075); if (this.state.failed) return retval;
+            BIND124=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4079); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND125_tree = this.adaptor.create(BIND125);
-            this.adaptor.addChild(root_0, BIND125_tree);
+            BIND124_tree = this.adaptor.create(BIND124);
+            this.adaptor.addChild(root_0, BIND124_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4077);
-            p_ExprSingle126=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4081);
+            p_ExprSingle125=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle126.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle125.getTree());
 
 
 
@@ -27277,7 +27283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:633:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
+    // xquery/XQueryParser.g:635:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
     // $ANTLR start "p_WindowClause"
     p_WindowClause: function() {
         var retval = new XQueryParser.p_WindowClause_return();
@@ -27286,17 +27292,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TumblingWindowClause127 = null;
-         var p_SlidingWindowClause128 = null;
+         var p_TumblingWindowClause126 = null;
+         var p_SlidingWindowClause127 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:634:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
-            // xquery/XQueryParser.g:634:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
+            // xquery/XQueryParser.g:636:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4106); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4110); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27304,7 +27310,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:634:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
             var alt59=2;
             var LA59_0 = this.input.LA(1);
 
@@ -27323,24 +27329,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt59) {
                 case 1 :
-                    // xquery/XQueryParser.g:634:33: p_TumblingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111);
-                    p_TumblingWindowClause127=this.p_TumblingWindowClause();
+                    // xquery/XQueryParser.g:636:33: p_TumblingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115);
+                    p_TumblingWindowClause126=this.p_TumblingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause127.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause126.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:634:58: p_SlidingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115);
-                    p_SlidingWindowClause128=this.p_SlidingWindowClause();
+                    // xquery/XQueryParser.g:636:58: p_SlidingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119);
+                    p_SlidingWindowClause127=this.p_SlidingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause128.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause127.getTree());
 
 
                     break;
@@ -27383,7 +27389,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:638:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:640:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_TumblingWindowClause"
     p_TumblingWindowClause: function() {
         var retval = new XQueryParser.p_TumblingWindowClause_return();
@@ -27394,20 +27400,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration129 = null;
-         var p_ExprSingle130 = null;
-         var p_WindowStartCondition131 = null;
-         var p_WindowEndCondition132 = null;
+         var p_TypeDeclaration128 = null;
+         var p_ExprSingle129 = null;
+         var p_WindowStartCondition130 = null;
+         var p_WindowEndCondition131 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:639:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:639:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:641:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:641:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4152); if (this.state.failed) return retval;
+            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4156); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27415,7 +27421,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4158); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4162); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27423,12 +27429,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4164); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4168);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4172);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27437,7 +27443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.av(d, (v?v.stop:null));
             }
-            // xquery/XQueryParser.g:639:106: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:641:106: ( p_TypeDeclaration )?
             var alt60=2;
             var LA60_0 = this.input.LA(1);
 
@@ -27446,20 +27452,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt60) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:106: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172);
-                    p_TypeDeclaration129=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:641:106: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176);
+                    p_TypeDeclaration128=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration129.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration128.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4177); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27467,19 +27473,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181);
-            p_ExprSingle130=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185);
+            p_ExprSingle129=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle130.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184);
-            p_WindowStartCondition131=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle129.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188);
+            p_WindowStartCondition130=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition131.getTree());
-            // xquery/XQueryParser.g:639:187: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition130.getTree());
+            // xquery/XQueryParser.g:641:187: ( p_WindowEndCondition )?
             var alt61=2;
             var LA61_0 = this.input.LA(1);
 
@@ -27488,13 +27494,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt61) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:187: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186);
-                    p_WindowEndCondition132=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:641:187: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190);
+                    p_WindowEndCondition131=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition132.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition131.getTree());
 
 
                     break;
@@ -27537,7 +27543,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:643:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:645:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_SlidingWindowClause"
     p_SlidingWindowClause: function() {
         var retval = new XQueryParser.p_SlidingWindowClause_return();
@@ -27548,20 +27554,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration133 = null;
-         var p_ExprSingle134 = null;
-         var p_WindowStartCondition135 = null;
-         var p_WindowEndCondition136 = null;
+         var p_TypeDeclaration132 = null;
+         var p_ExprSingle133 = null;
+         var p_WindowStartCondition134 = null;
+         var p_WindowEndCondition135 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:644:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:644:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:646:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:646:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4215); if (this.state.failed) return retval;
+            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4219); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27569,7 +27575,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4221); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4225); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27577,12 +27583,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4227); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4231); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4231);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4235);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -27591,7 +27597,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:644:107: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:646:107: ( p_TypeDeclaration )?
             var alt62=2;
             var LA62_0 = this.input.LA(1);
 
@@ -27600,20 +27606,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt62) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:107: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235);
-                    p_TypeDeclaration133=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:646:107: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239);
+                    p_TypeDeclaration132=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration133.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration132.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4240); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27621,19 +27627,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244);
-            p_ExprSingle134=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248);
+            p_ExprSingle133=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle134.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247);
-            p_WindowStartCondition135=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle133.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251);
+            p_WindowStartCondition134=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition135.getTree());
-            // xquery/XQueryParser.g:644:188: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition134.getTree());
+            // xquery/XQueryParser.g:646:188: ( p_WindowEndCondition )?
             var alt63=2;
             var LA63_0 = this.input.LA(1);
 
@@ -27642,13 +27648,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt63) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:188: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249);
-                    p_WindowEndCondition136=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:646:188: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253);
+                    p_WindowEndCondition135=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition136.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition135.getTree());
 
 
                     break;
@@ -27691,7 +27697,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:648:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:650:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowStartCondition"
     p_WindowStartCondition: function() {
         var retval = new XQueryParser.p_WindowStartCondition_return();
@@ -27700,17 +27706,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars137 = null;
-         var p_ExprSingle138 = null;
+         var p_WindowVars136 = null;
+         var p_ExprSingle137 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:649:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:649:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:651:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:651:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4278); if (this.state.failed) return retval;
+            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4282); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27718,13 +27724,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4282);
-            p_WindowVars137=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4286);
+            p_WindowVars136=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars137.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4286); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars136.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4290); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27732,12 +27738,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290);
-            p_ExprSingle138=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294);
+            p_ExprSingle137=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle138.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle137.getTree());
 
 
 
@@ -27774,7 +27780,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:653:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:655:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowEndCondition"
     p_WindowEndCondition: function() {
         var retval = new XQueryParser.p_WindowEndCondition_return();
@@ -27783,17 +27789,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars139 = null;
-         var p_ExprSingle140 = null;
+         var p_WindowVars138 = null;
+         var p_ExprSingle139 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:654:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:654:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:656:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:656:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:654:11: (k= ONLY )?
+            // xquery/XQueryParser.g:656:11: (k= ONLY )?
             var alt64=2;
             var LA64_0 = this.input.LA(1);
 
@@ -27802,8 +27808,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt64) {
                 case 1 :
-                    // xquery/XQueryParser.g:654:12: k= ONLY
-                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4320); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:656:12: k= ONLY
+                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4324); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27817,7 +27823,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4328); if (this.state.failed) return retval;
+            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27825,13 +27831,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4332);
-            p_WindowVars139=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4336);
+            p_WindowVars138=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars139.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4336); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars138.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4340); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27839,12 +27845,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340);
-            p_ExprSingle140=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344);
+            p_ExprSingle139=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle140.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle139.getTree());
 
 
 
@@ -27881,7 +27887,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:658:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
+    // xquery/XQueryParser.g:660:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
     // $ANTLR start "p_WindowVars"
     p_WindowVars: function() {
         var retval = new XQueryParser.p_WindowVars_return();
@@ -27891,24 +27897,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var k = null;
-        var DOLLAR142 = null;
-        var DOLLAR144 = null;
+        var DOLLAR141 = null;
+        var DOLLAR143 = null;
          var v = null;
-         var p_PositionalVar141 = null;
-         var p_PreviousItem143 = null;
-         var p_NextItem145 = null;
+         var p_PositionalVar140 = null;
+         var p_PreviousItem142 = null;
+         var p_NextItem144 = null;
 
         var d_tree=null;
         var k_tree=null;
-        var DOLLAR142_tree=null;
-        var DOLLAR144_tree=null;
+        var DOLLAR141_tree=null;
+        var DOLLAR143_tree=null;
 
         try {
-            // xquery/XQueryParser.g:659:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )?
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )?
             var alt65=2;
             var LA65_0 = this.input.LA(1);
 
@@ -27917,13 +27923,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt65) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:12: d= DOLLAR v= p_CurrentItem
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4370); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:12: d= DOLLAR v= p_CurrentItem
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4374);
+                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4378);
                     v=this.p_CurrentItem();
 
                     this.state._fsp--;
@@ -27938,7 +27944,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:659:65: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:661:65: ( p_PositionalVar )?
             var alt66=2;
             var LA66_0 = this.input.LA(1);
 
@@ -27947,20 +27953,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt66) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:65: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4380);
-                    p_PositionalVar141=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:661:65: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4384);
+                    p_PositionalVar140=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar141.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar140.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
+            // xquery/XQueryParser.g:661:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
             var alt67=2;
             var LA67_0 = this.input.LA(1);
 
@@ -27969,8 +27975,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt67) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:83: k= PREVIOUS DOLLAR p_PreviousItem
-                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4386); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:83: k= PREVIOUS DOLLAR p_PreviousItem
+                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4390); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27978,24 +27984,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR142=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4390); if (this.state.failed) return retval;
+                    DOLLAR141=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4394); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR142_tree = this.adaptor.create(DOLLAR142);
-                    this.adaptor.addChild(root_0, DOLLAR142_tree);
+                    DOLLAR141_tree = this.adaptor.create(DOLLAR141);
+                    this.adaptor.addChild(root_0, DOLLAR141_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4392);
-                    p_PreviousItem143=this.p_PreviousItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4396);
+                    p_PreviousItem142=this.p_PreviousItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem143.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem142.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:133: (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:133: (k= NEXT DOLLAR p_NextItem )?
             var alt68=2;
             var LA68_0 = this.input.LA(1);
 
@@ -28004,8 +28010,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt68) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:134: k= NEXT DOLLAR p_NextItem
-                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4399); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:134: k= NEXT DOLLAR p_NextItem
+                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4403); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28013,17 +28019,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR144=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4403); if (this.state.failed) return retval;
+                    DOLLAR143=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4407); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR144_tree = this.adaptor.create(DOLLAR144);
-                    this.adaptor.addChild(root_0, DOLLAR144_tree);
+                    DOLLAR143_tree = this.adaptor.create(DOLLAR143);
+                    this.adaptor.addChild(root_0, DOLLAR143_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4405);
-                    p_NextItem145=this.p_NextItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4409);
+                    p_NextItem144=this.p_NextItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem145.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem144.getTree());
 
 
                     break;
@@ -28066,7 +28072,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:663:1: p_CurrentItem : p_QName ;
+    // xquery/XQueryParser.g:665:1: p_CurrentItem : p_QName ;
     // $ANTLR start "p_CurrentItem"
     p_CurrentItem: function() {
         var retval = new XQueryParser.p_CurrentItem_return();
@@ -28074,20 +28080,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName146 = null;
+         var p_QName145 = null;
 
 
         try {
-            // xquery/XQueryParser.g:664:9: ( p_QName )
-            // xquery/XQueryParser.g:664:11: p_QName
+            // xquery/XQueryParser.g:666:9: ( p_QName )
+            // xquery/XQueryParser.g:666:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4433);
-            p_QName146=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4437);
+            p_QName145=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName145.getTree());
 
 
 
@@ -28124,7 +28130,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:668:1: p_PreviousItem : p_QName ;
+    // xquery/XQueryParser.g:670:1: p_PreviousItem : p_QName ;
     // $ANTLR start "p_PreviousItem"
     p_PreviousItem: function() {
         var retval = new XQueryParser.p_PreviousItem_return();
@@ -28132,20 +28138,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName147 = null;
+         var p_QName146 = null;
 
 
         try {
-            // xquery/XQueryParser.g:669:9: ( p_QName )
-            // xquery/XQueryParser.g:669:11: p_QName
+            // xquery/XQueryParser.g:671:9: ( p_QName )
+            // xquery/XQueryParser.g:671:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4459);
-            p_QName147=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4463);
+            p_QName146=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
 
 
 
@@ -28182,7 +28188,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:673:1: p_NextItem : p_QName ;
+    // xquery/XQueryParser.g:675:1: p_NextItem : p_QName ;
     // $ANTLR start "p_NextItem"
     p_NextItem: function() {
         var retval = new XQueryParser.p_NextItem_return();
@@ -28190,20 +28196,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName148 = null;
+         var p_QName147 = null;
 
 
         try {
-            // xquery/XQueryParser.g:674:9: ( p_QName )
-            // xquery/XQueryParser.g:674:11: p_QName
+            // xquery/XQueryParser.g:676:9: ( p_QName )
+            // xquery/XQueryParser.g:676:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4485);
-            p_QName148=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4489);
+            p_QName147=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName148.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
 
 
 
@@ -28240,7 +28246,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:678:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:680:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_CountClause"
     p_CountClause: function() {
         var retval = new XQueryParser.p_CountClause_return();
@@ -28256,11 +28262,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:679:9: (k= COUNT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:679:11: k= COUNT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:681:9: (k= COUNT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:681:11: k= COUNT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4513); if (this.state.failed) return retval;
+            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4517); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28268,12 +28274,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4519); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4523); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4523);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4527);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -28318,7 +28324,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:683:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:685:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
     // $ANTLR start "p_WhereClause"
     p_WhereClause: function() {
         var retval = new XQueryParser.p_WhereClause_return();
@@ -28327,16 +28333,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ExprSingle149 = null;
+         var p_ExprSingle148 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:684:9: (k= WHERE p_ExprSingle[true] )
-            // xquery/XQueryParser.g:684:11: k= WHERE p_ExprSingle[true]
+            // xquery/XQueryParser.g:686:9: (k= WHERE p_ExprSingle[true] )
+            // xquery/XQueryParser.g:686:11: k= WHERE p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4561); if (this.state.failed) return retval;
+            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4565); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28344,12 +28350,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4565);
-            p_ExprSingle149=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4569);
+            p_ExprSingle148=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle149.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle148.getTree());
 
 
 
@@ -28386,7 +28392,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:688:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
+    // xquery/XQueryParser.g:690:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
     // $ANTLR start "p_GroupByClause"
     p_GroupByClause: function() {
         var retval = new XQueryParser.p_GroupByClause_return();
@@ -28395,16 +28401,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_GroupingSpecList150 = null;
+         var p_GroupingSpecList149 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:689:9: (k= GROUP k= BY p_GroupingSpecList )
-            // xquery/XQueryParser.g:689:11: k= GROUP k= BY p_GroupingSpecList
+            // xquery/XQueryParser.g:691:9: (k= GROUP k= BY p_GroupingSpecList )
+            // xquery/XQueryParser.g:691:11: k= GROUP k= BY p_GroupingSpecList
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4594); if (this.state.failed) return retval;
+            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4598); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28412,7 +28418,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4600); if (this.state.failed) return retval;
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4604); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -28420,12 +28426,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604);
-            p_GroupingSpecList150=this.p_GroupingSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608);
+            p_GroupingSpecList149=this.p_GroupingSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList150.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList149.getTree());
 
 
 
@@ -28462,7 +28468,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:693:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
+    // xquery/XQueryParser.g:695:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
     // $ANTLR start "p_GroupingSpecList"
     p_GroupingSpecList: function() {
         var retval = new XQueryParser.p_GroupingSpecList_return();
@@ -28470,24 +28476,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA152 = null;
-         var p_GroupingSpec151 = null;
-         var p_GroupingSpec153 = null;
+        var COMMA151 = null;
+         var p_GroupingSpec150 = null;
+         var p_GroupingSpec152 = null;
 
-        var COMMA152_tree=null;
+        var COMMA151_tree=null;
 
         try {
-            // xquery/XQueryParser.g:694:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
-            // xquery/XQueryParser.g:694:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
+            // xquery/XQueryParser.g:696:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
+            // xquery/XQueryParser.g:696:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630);
-            p_GroupingSpec151=this.p_GroupingSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634);
+            p_GroupingSpec150=this.p_GroupingSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec151.getTree());
-            // xquery/XQueryParser.g:694:26: ( COMMA p_GroupingSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec150.getTree());
+            // xquery/XQueryParser.g:696:26: ( COMMA p_GroupingSpec )*
             loop69:
             do {
                 var alt69=2;
@@ -28500,18 +28506,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt69) {
                 case 1 :
-                    // xquery/XQueryParser.g:694:27: COMMA p_GroupingSpec
-                    COMMA152=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4633); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:696:27: COMMA p_GroupingSpec
+                    COMMA151=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4637); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA152_tree = this.adaptor.create(COMMA152);
-                    this.adaptor.addChild(root_0, COMMA152_tree);
+                    COMMA151_tree = this.adaptor.create(COMMA151);
+                    this.adaptor.addChild(root_0, COMMA151_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635);
-                    p_GroupingSpec153=this.p_GroupingSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639);
+                    p_GroupingSpec152=this.p_GroupingSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec153.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec152.getTree());
 
 
                     break;
@@ -28557,7 +28563,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:698:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:700:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_GroupingSpec"
     p_GroupingSpec: function() {
         var retval = new XQueryParser.p_GroupingSpec_return();
@@ -28568,22 +28574,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_StringLiteral154 = null;
+         var p_StringLiteral153 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:699:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:699:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:701:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4665); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4669); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4669);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4673);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -28592,7 +28598,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:699:58: (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:58: (k= COLLATION p_StringLiteral )?
             var alt70=2;
             var LA70_0 = this.input.LA(1);
 
@@ -28601,8 +28607,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt70) {
                 case 1 :
-                    // xquery/XQueryParser.g:699:59: k= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4676); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:701:59: k= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4680); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28610,12 +28616,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4680);
-                    p_StringLiteral154=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4684);
+                    p_StringLiteral153=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral154.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral153.getTree());
 
 
                     break;
@@ -28658,7 +28664,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:703:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
+    // xquery/XQueryParser.g:705:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
     // $ANTLR start "p_OrderByClause"
     p_OrderByClause: function() {
         var retval = new XQueryParser.p_OrderByClause_return();
@@ -28668,16 +28674,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_OrderSpecList155 = null;
+         var p_OrderSpecList154 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:704:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
+            // xquery/XQueryParser.g:706:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
             var alt71=2;
             var LA71_0 = this.input.LA(1);
 
@@ -28696,10 +28702,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt71) {
                 case 1 :
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:13: k+= ORDER k+= BY
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4712); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:13: k+= ORDER k+= BY
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4716); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28707,7 +28713,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4716); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28722,10 +28728,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:32: k+= STABLE k+= ORDER k+= BY
-                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4724); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:32: k+= STABLE k+= ORDER k+= BY
+                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4728); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28733,7 +28739,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4728); if (this.state.failed) return retval;
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4732); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28741,7 +28747,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4732); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4736); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28761,12 +28767,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4738);
-            p_OrderSpecList155=this.p_OrderSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4742);
+            p_OrderSpecList154=this.p_OrderSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList155.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList154.getTree());
 
 
 
@@ -28803,7 +28809,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:708:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
+    // xquery/XQueryParser.g:710:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
     // $ANTLR start "p_OrderSpecList"
     p_OrderSpecList: function() {
         var retval = new XQueryParser.p_OrderSpecList_return();
@@ -28811,24 +28817,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA157 = null;
-         var p_OrderSpec156 = null;
-         var p_OrderSpec158 = null;
+        var COMMA156 = null;
+         var p_OrderSpec155 = null;
+         var p_OrderSpec157 = null;
 
-        var COMMA157_tree=null;
+        var COMMA156_tree=null;
 
         try {
-            // xquery/XQueryParser.g:709:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
-            // xquery/XQueryParser.g:709:11: p_OrderSpec ( COMMA p_OrderSpec )*
+            // xquery/XQueryParser.g:711:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
+            // xquery/XQueryParser.g:711:11: p_OrderSpec ( COMMA p_OrderSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4764);
-            p_OrderSpec156=this.p_OrderSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4768);
+            p_OrderSpec155=this.p_OrderSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec156.getTree());
-            // xquery/XQueryParser.g:709:23: ( COMMA p_OrderSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec155.getTree());
+            // xquery/XQueryParser.g:711:23: ( COMMA p_OrderSpec )*
             loop72:
             do {
                 var alt72=2;
@@ -28841,18 +28847,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt72) {
                 case 1 :
-                    // xquery/XQueryParser.g:709:24: COMMA p_OrderSpec
-                    COMMA157=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4767); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:711:24: COMMA p_OrderSpec
+                    COMMA156=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4771); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA157_tree = this.adaptor.create(COMMA157);
-                    this.adaptor.addChild(root_0, COMMA157_tree);
+                    COMMA156_tree = this.adaptor.create(COMMA156);
+                    this.adaptor.addChild(root_0, COMMA156_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4769);
-                    p_OrderSpec158=this.p_OrderSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4773);
+                    p_OrderSpec157=this.p_OrderSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec158.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec157.getTree());
 
 
                     break;
@@ -28898,7 +28904,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:713:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
+    // xquery/XQueryParser.g:715:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
     // $ANTLR start "p_OrderSpec"
     p_OrderSpec: function() {
         var retval = new XQueryParser.p_OrderSpec_return();
@@ -28906,27 +28912,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle159 = null;
-         var p_OrderModifier160 = null;
+         var p_ExprSingle158 = null;
+         var p_OrderModifier159 = null;
 
 
         try {
-            // xquery/XQueryParser.g:714:9: ( p_ExprSingle[true] p_OrderModifier )
-            // xquery/XQueryParser.g:714:11: p_ExprSingle[true] p_OrderModifier
+            // xquery/XQueryParser.g:716:9: ( p_ExprSingle[true] p_OrderModifier )
+            // xquery/XQueryParser.g:716:11: p_ExprSingle[true] p_OrderModifier
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4797);
-            p_ExprSingle159=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4801);
+            p_ExprSingle158=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle159.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4800);
-            p_OrderModifier160=this.p_OrderModifier();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle158.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4804);
+            p_OrderModifier159=this.p_OrderModifier();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier160.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier159.getTree());
 
 
 
@@ -28963,7 +28969,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:718:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:720:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_OrderModifier"
     p_OrderModifier: function() {
         var retval = new XQueryParser.p_OrderModifier_return();
@@ -28973,16 +28979,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral161 = null;
+         var p_StringLiteral160 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:719:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )?
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )?
             var alt73=3;
             var LA73_0 = this.input.LA(1);
 
@@ -28994,8 +29000,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt73) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:12: k+= ASCENDING
-                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4829); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:12: k+= ASCENDING
+                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4833); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29007,8 +29013,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:719:27: k+= DESCENDING
-                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4835); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:27: k+= DESCENDING
+                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4839); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29022,7 +29028,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
+            // xquery/XQueryParser.g:721:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
             var alt75=2;
             var LA75_0 = this.input.LA(1);
 
@@ -29031,8 +29037,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt75) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
-                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4842); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
+                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4846); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29040,7 +29046,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:719:53: (k+= GREATEST | k+= LEAST )
+                    // xquery/XQueryParser.g:721:53: (k+= GREATEST | k+= LEAST )
                     var alt74=2;
                     var LA74_0 = this.input.LA(1);
 
@@ -29059,8 +29065,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt74) {
                         case 1 :
-                            // xquery/XQueryParser.g:719:54: k+= GREATEST
-                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4847); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:54: k+= GREATEST
+                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4851); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29072,8 +29078,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:719:68: k+= LEAST
-                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4853); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:68: k+= LEAST
+                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4857); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29093,7 +29099,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:80: (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:80: (k+= COLLATION p_StringLiteral )?
             var alt76=2;
             var LA76_0 = this.input.LA(1);
 
@@ -29102,8 +29108,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt76) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:81: k+= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4861); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:81: k+= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29111,12 +29117,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4863);
-                    p_StringLiteral161=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4867);
+                    p_StringLiteral160=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral161.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral160.getTree());
 
 
                     break;
@@ -29162,7 +29168,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:723:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:725:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_ReturnHybrid"
     p_ReturnHybrid: function(strict) {
         var retval = new XQueryParser.p_ReturnHybrid_return();
@@ -29171,16 +29177,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid162 = null;
+         var p_Hybrid161 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:724:9: (k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:724:11: k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:726:9: (k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:726:11: k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4896); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29188,12 +29194,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4900);
-            p_Hybrid162=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4904);
+            p_Hybrid161=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid162.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid161.getTree());
 
 
 
@@ -29230,7 +29236,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:728:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:730:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
     // $ANTLR start "p_QuantifiedExpr"
     p_QuantifiedExpr: function() {
         var retval = new XQueryParser.p_QuantifiedExpr_return();
@@ -29241,26 +29247,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var COMMA165 = null;
+        var COMMA164 = null;
          var v = null;
          var w = null;
-         var p_TypeDeclaration163 = null;
-         var p_ExprSingle164 = null;
-         var p_TypeDeclaration166 = null;
+         var p_TypeDeclaration162 = null;
+         var p_ExprSingle163 = null;
+         var p_TypeDeclaration165 = null;
+         var p_ExprSingle166 = null;
          var p_ExprSingle167 = null;
-         var p_ExprSingle168 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var COMMA165_tree=null;
+        var COMMA164_tree=null;
 
         try {
-            // xquery/XQueryParser.g:729:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
+            // xquery/XQueryParser.g:731:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY )
             var alt77=2;
             var LA77_0 = this.input.LA(1);
 
@@ -29279,8 +29285,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt77) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:12: k= SOME
-                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4930); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:12: k= SOME
+                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4934); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29289,8 +29295,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:729:21: k= EVERY
-                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4936); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:21: k= EVERY
+                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4940); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29304,12 +29310,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4943); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4947); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4947);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4951);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -29318,7 +29324,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:729:92: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:731:92: ( p_TypeDeclaration )?
             var alt78=2;
             var LA78_0 = this.input.LA(1);
 
@@ -29327,20 +29333,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt78) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:92: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951);
-                    p_TypeDeclaration163=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:731:92: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955);
+                    p_TypeDeclaration162=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration163.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration162.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4956); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4960); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29348,13 +29354,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960);
-            p_ExprSingle164=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964);
+            p_ExprSingle163=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle164.getTree());
-            // xquery/XQueryParser.g:729:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle163.getTree());
+            // xquery/XQueryParser.g:731:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
             loop80:
             do {
                 var alt80=2;
@@ -29367,18 +29373,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt80) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
-                    COMMA165=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4964); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
+                    COMMA164=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA165_tree = this.adaptor.create(COMMA165);
-                    this.adaptor.addChild(root_0, COMMA165_tree);
+                    COMMA164_tree = this.adaptor.create(COMMA164);
+                    this.adaptor.addChild(root_0, COMMA164_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4972); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4972);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4976);
                     w=this.p_QName();
 
                     this.state._fsp--;
@@ -29387,7 +29393,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(e, (w?w.stop:null));
                     }
-                    // xquery/XQueryParser.g:729:200: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:731:200: ( p_TypeDeclaration )?
                     var alt79=2;
                     var LA79_0 = this.input.LA(1);
 
@@ -29396,20 +29402,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt79) {
                         case 1 :
-                            // xquery/XQueryParser.g:729:200: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976);
-                            p_TypeDeclaration166=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:731:200: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980);
+                            p_TypeDeclaration165=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration166.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration165.getTree());
 
 
                             break;
 
                     }
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4981); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29417,12 +29423,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985);
-                    p_ExprSingle167=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989);
+                    p_ExprSingle166=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle166.getTree());
 
 
                     break;
@@ -29432,7 +29438,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4992); if (this.state.failed) return retval;
+            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4996); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29440,12 +29446,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996);
-            p_ExprSingle168=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000);
+            p_ExprSingle167=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle168.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
 
 
 
@@ -29482,7 +29488,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:733:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:735:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchHybrid"
     p_SwitchHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchHybrid_return();
@@ -29491,22 +29497,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN169 = null;
-        var RPAREN171 = null;
-         var p_Expr170 = null;
-         var p_SwitchCaseHybrid172 = null;
-         var p_Hybrid173 = null;
+        var LPAREN168 = null;
+        var RPAREN170 = null;
+         var p_Expr169 = null;
+         var p_SwitchCaseHybrid171 = null;
+         var p_Hybrid172 = null;
 
         var k_tree=null;
-        var LPAREN169_tree=null;
-        var RPAREN171_tree=null;
+        var LPAREN168_tree=null;
+        var RPAREN170_tree=null;
 
         try {
-            // xquery/XQueryParser.g:734:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:734:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:736:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:736:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5026); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29514,23 +29520,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN169=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
+            LPAREN168=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5034); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN169_tree = this.adaptor.create(LPAREN169);
-            this.adaptor.addChild(root_0, LPAREN169_tree);
+            LPAREN168_tree = this.adaptor.create(LPAREN168);
+            this.adaptor.addChild(root_0, LPAREN168_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5032);
-            p_Expr170=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5036);
+            p_Expr169=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr170.getTree());
-            RPAREN171=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5035); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr169.getTree());
+            RPAREN170=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5039); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN171_tree = this.adaptor.create(RPAREN171);
-            this.adaptor.addChild(root_0, RPAREN171_tree);
+            RPAREN170_tree = this.adaptor.create(RPAREN170);
+            this.adaptor.addChild(root_0, RPAREN170_tree);
             }
-            // xquery/XQueryParser.g:734:67: ( p_SwitchCaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:736:67: ( p_SwitchCaseHybrid[$strict] )+
             var cnt81=0;
             loop81:
             do {
@@ -29544,13 +29550,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt81) {
                 case 1 :
-                    // xquery/XQueryParser.g:734:67: p_SwitchCaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037);
-                    p_SwitchCaseHybrid172=this.p_SwitchCaseHybrid(strict);
+                    // xquery/XQueryParser.g:736:67: p_SwitchCaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041);
+                    p_SwitchCaseHybrid171=this.p_SwitchCaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid172.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid171.getTree());
 
 
                     break;
@@ -29566,7 +29572,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt81++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5043); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5047); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29574,7 +29580,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5049); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5053); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29582,12 +29588,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5053);
-            p_Hybrid173=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5057);
+            p_Hybrid172=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid173.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid172.getTree());
 
 
 
@@ -29624,7 +29630,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:738:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:740:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchCaseHybrid"
     p_SwitchCaseHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchCaseHybrid_return();
@@ -29633,17 +29639,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand174 = null;
-         var p_Hybrid175 = null;
+         var p_SwitchCaseOperand173 = null;
+         var p_Hybrid174 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:739:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:741:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+
             var cnt82=0;
             loop82:
             do {
@@ -29657,8 +29663,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt82) {
                 case 1 :
-                    // xquery/XQueryParser.g:739:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:741:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5088); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29666,12 +29672,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088);
-                    p_SwitchCaseOperand174=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092);
+                    p_SwitchCaseOperand173=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand174.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand173.getTree());
 
 
                     break;
@@ -29687,7 +29693,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt82++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5094); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5098); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29695,12 +29701,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098);
-            p_Hybrid175=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102);
+            p_Hybrid174=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid175.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid174.getTree());
 
 
 
@@ -29737,7 +29743,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:743:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:745:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
     // $ANTLR start "p_SwitchCaseOperand"
     p_SwitchCaseOperand: function() {
         var retval = new XQueryParser.p_SwitchCaseOperand_return();
@@ -29745,20 +29751,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle176 = null;
+         var p_ExprSingle175 = null;
 
 
         try {
-            // xquery/XQueryParser.g:744:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:744:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:746:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:746:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125);
-            p_ExprSingle176=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129);
+            p_ExprSingle175=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle176.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle175.getTree());
 
 
 
@@ -29795,7 +29801,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:748:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:750:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_TypeswitchHybrid"
     p_TypeswitchHybrid: function(strict) {
         var retval = new XQueryParser.p_TypeswitchHybrid_return();
@@ -29805,24 +29811,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN177 = null;
-        var RPAREN179 = null;
+        var LPAREN176 = null;
+        var RPAREN178 = null;
          var v = null;
-         var p_Expr178 = null;
-         var p_CaseHybrid180 = null;
-         var p_Hybrid181 = null;
+         var p_Expr177 = null;
+         var p_CaseHybrid179 = null;
+         var p_Hybrid180 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN177_tree=null;
-        var RPAREN179_tree=null;
+        var LPAREN176_tree=null;
+        var RPAREN178_tree=null;
 
         try {
-            // xquery/XQueryParser.g:749:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:749:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:751:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:751:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29830,23 +29836,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN177=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
+            LPAREN176=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5163); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN177_tree = this.adaptor.create(LPAREN177);
-            this.adaptor.addChild(root_0, LPAREN177_tree);
+            LPAREN176_tree = this.adaptor.create(LPAREN176);
+            this.adaptor.addChild(root_0, LPAREN176_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5161);
-            p_Expr178=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5165);
+            p_Expr177=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr178.getTree());
-            RPAREN179=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5164); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr177.getTree());
+            RPAREN178=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN179_tree = this.adaptor.create(RPAREN179);
-            this.adaptor.addChild(root_0, RPAREN179_tree);
+            RPAREN178_tree = this.adaptor.create(RPAREN178);
+            this.adaptor.addChild(root_0, RPAREN178_tree);
             }
-            // xquery/XQueryParser.g:749:71: ( p_CaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:751:71: ( p_CaseHybrid[$strict] )+
             var cnt83=0;
             loop83:
             do {
@@ -29860,13 +29866,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt83) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:71: p_CaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166);
-                    p_CaseHybrid180=this.p_CaseHybrid(strict);
+                    // xquery/XQueryParser.g:751:71: p_CaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170);
+                    p_CaseHybrid179=this.p_CaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid180.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid179.getTree());
 
 
                     break;
@@ -29882,7 +29888,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt83++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29890,7 +29896,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:749:119: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:751:119: (d= DOLLAR v= p_VarName )?
             var alt84=2;
             var LA84_0 = this.input.LA(1);
 
@@ -29899,13 +29905,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt84) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:120: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:751:120: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5183);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5187);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -29920,7 +29926,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5191); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5195); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29928,12 +29934,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195);
-            p_Hybrid181=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199);
+            p_Hybrid180=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid181.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid180.getTree());
 
 
 
@@ -29970,7 +29976,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:753:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
+    // xquery/XQueryParser.g:755:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
     // $ANTLR start "p_CaseHybrid"
     p_CaseHybrid: function(strict) {
         var retval = new XQueryParser.p_CaseHybrid_return();
@@ -29981,18 +29987,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_SequenceTypeUnion182 = null;
-         var p_ExprSingle183 = null;
+         var p_SequenceTypeUnion181 = null;
+         var p_ExprSingle182 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:754:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
-            // xquery/XQueryParser.g:754:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
+            // xquery/XQueryParser.g:756:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
+            // xquery/XQueryParser.g:756:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5225); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5229); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30000,7 +30006,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:754:33: (d= DOLLAR v= p_VarName k= AS )?
+            // xquery/XQueryParser.g:756:33: (d= DOLLAR v= p_VarName k= AS )?
             var alt85=2;
             var LA85_0 = this.input.LA(1);
 
@@ -30009,13 +30015,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt85) {
                 case 1 :
-                    // xquery/XQueryParser.g:754:34: d= DOLLAR v= p_VarName k= AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5232); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:756:34: d= DOLLAR v= p_VarName k= AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5236); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5236);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5240);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -30024,7 +30030,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5242); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5246); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30038,13 +30044,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248);
-            p_SequenceTypeUnion182=this.p_SequenceTypeUnion();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252);
+            p_SequenceTypeUnion181=this.p_SequenceTypeUnion();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion182.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5252); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion181.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5256); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30052,12 +30058,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5256);
-            p_ExprSingle183=this.p_ExprSingle(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5260);
+            p_ExprSingle182=this.p_ExprSingle(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle183.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle182.getTree());
 
 
 
@@ -30094,7 +30100,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:758:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
+    // xquery/XQueryParser.g:760:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
     // $ANTLR start "p_SequenceTypeUnion"
     p_SequenceTypeUnion: function() {
         var retval = new XQueryParser.p_SequenceTypeUnion_return();
@@ -30102,24 +30108,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR185 = null;
-         var p_SequenceType184 = null;
-         var p_SequenceType186 = null;
+        var VBAR184 = null;
+         var p_SequenceType183 = null;
+         var p_SequenceType185 = null;
 
-        var VBAR185_tree=null;
+        var VBAR184_tree=null;
 
         try {
-            // xquery/XQueryParser.g:759:9: ( p_SequenceType ( VBAR p_SequenceType )* )
-            // xquery/XQueryParser.g:759:11: p_SequenceType ( VBAR p_SequenceType )*
+            // xquery/XQueryParser.g:761:9: ( p_SequenceType ( VBAR p_SequenceType )* )
+            // xquery/XQueryParser.g:761:11: p_SequenceType ( VBAR p_SequenceType )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283);
-            p_SequenceType184=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287);
+            p_SequenceType183=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType184.getTree());
-            // xquery/XQueryParser.g:759:26: ( VBAR p_SequenceType )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType183.getTree());
+            // xquery/XQueryParser.g:761:26: ( VBAR p_SequenceType )*
             loop86:
             do {
                 var alt86=2;
@@ -30132,18 +30138,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt86) {
                 case 1 :
-                    // xquery/XQueryParser.g:759:27: VBAR p_SequenceType
-                    VBAR185=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5286); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:761:27: VBAR p_SequenceType
+                    VBAR184=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    VBAR185_tree = this.adaptor.create(VBAR185);
-                    this.adaptor.addChild(root_0, VBAR185_tree);
+                    VBAR184_tree = this.adaptor.create(VBAR184);
+                    this.adaptor.addChild(root_0, VBAR184_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288);
-                    p_SequenceType186=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292);
+                    p_SequenceType185=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType186.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType185.getTree());
 
 
                     break;
@@ -30189,7 +30195,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:763:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:765:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
     // $ANTLR start "p_IfHybrid"
     p_IfHybrid: function(strict) {
         var retval = new XQueryParser.p_IfHybrid_return();
@@ -30198,22 +30204,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN187 = null;
-        var RPAREN189 = null;
-         var p_Expr188 = null;
+        var LPAREN186 = null;
+        var RPAREN188 = null;
+         var p_Expr187 = null;
+         var p_Hybrid189 = null;
          var p_Hybrid190 = null;
-         var p_Hybrid191 = null;
 
         var k_tree=null;
-        var LPAREN187_tree=null;
-        var RPAREN189_tree=null;
+        var LPAREN186_tree=null;
+        var RPAREN188_tree=null;
 
         try {
-            // xquery/XQueryParser.g:764:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:764:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:766:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:766:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5319); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5323); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30221,23 +30227,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN187=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5323); if (this.state.failed) return retval;
+            LPAREN186=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN187_tree = this.adaptor.create(LPAREN187);
-            this.adaptor.addChild(root_0, LPAREN187_tree);
+            LPAREN186_tree = this.adaptor.create(LPAREN186);
+            this.adaptor.addChild(root_0, LPAREN186_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5325);
-            p_Expr188=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5329);
+            p_Expr187=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr188.getTree());
-            RPAREN189=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5328); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr187.getTree());
+            RPAREN188=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN189_tree = this.adaptor.create(RPAREN189);
-            this.adaptor.addChild(root_0, RPAREN189_tree);
+            RPAREN188_tree = this.adaptor.create(RPAREN188);
+            this.adaptor.addChild(root_0, RPAREN188_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5332); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5336); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30245,26 +30251,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5336);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5340);
+            p_Hybrid189=this.p_Hybrid(strict, false);
+
+            this.state._fsp--;
+            if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid189.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) {
+            k_tree = this.adaptor.create(k);
+            this.adaptor.addChild(root_0, k_tree);
+            }
+            if ( this.state.backtracking===0 ) {
+              this.ak(k);
+            }
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5349);
             p_Hybrid190=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid190.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5341); if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) {
-            k_tree = this.adaptor.create(k);
-            this.adaptor.addChild(root_0, k_tree);
-            }
-            if ( this.state.backtracking===0 ) {
-              this.ak(k);
-            }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5345);
-            p_Hybrid191=this.p_Hybrid(strict, false);
-
-            this.state._fsp--;
-            if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid191.getTree());
 
 
 
@@ -30301,7 +30307,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:768:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
+    // xquery/XQueryParser.g:770:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
     // $ANTLR start "p_TryCatchExpr"
     p_TryCatchExpr: function() {
         var retval = new XQueryParser.p_TryCatchExpr_return();
@@ -30309,22 +30315,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_TryClause192 = null;
-         var p_CatchClause193 = null;
+         var p_TryClause191 = null;
+         var p_CatchClause192 = null;
 
 
         try {
-            // xquery/XQueryParser.g:769:9: ( p_TryClause ( p_CatchClause )+ )
-            // xquery/XQueryParser.g:769:11: p_TryClause ( p_CatchClause )+
+            // xquery/XQueryParser.g:771:9: ( p_TryClause ( p_CatchClause )+ )
+            // xquery/XQueryParser.g:771:11: p_TryClause ( p_CatchClause )+
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5372);
-            p_TryClause192=this.p_TryClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5376);
+            p_TryClause191=this.p_TryClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause192.getTree());
-            // xquery/XQueryParser.g:769:23: ( p_CatchClause )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause191.getTree());
+            // xquery/XQueryParser.g:771:23: ( p_CatchClause )+
             var cnt87=0;
             loop87:
             do {
@@ -30338,13 +30344,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt87) {
                 case 1 :
-                    // xquery/XQueryParser.g:769:23: p_CatchClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5374);
-                    p_CatchClause193=this.p_CatchClause();
+                    // xquery/XQueryParser.g:771:23: p_CatchClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5378);
+                    p_CatchClause192=this.p_CatchClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause193.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause192.getTree());
 
 
                     break;
@@ -30396,7 +30402,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:773:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
+    // xquery/XQueryParser.g:775:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
     // $ANTLR start "p_TryClause"
     p_TryClause: function() {
         var retval = new XQueryParser.p_TryClause_return();
@@ -30405,20 +30411,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET194 = null;
-        var RBRACKET196 = null;
-         var p_TryTargetExpr195 = null;
+        var LBRACKET193 = null;
+        var RBRACKET195 = null;
+         var p_TryTargetExpr194 = null;
 
         var k_tree=null;
-        var LBRACKET194_tree=null;
-        var RBRACKET196_tree=null;
+        var LBRACKET193_tree=null;
+        var RBRACKET195_tree=null;
 
         try {
-            // xquery/XQueryParser.g:774:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
-            // xquery/XQueryParser.g:774:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
+            // xquery/XQueryParser.g:776:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
+            // xquery/XQueryParser.g:776:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5403); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5407); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30426,21 +30432,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET194=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5407); if (this.state.failed) return retval;
+            LBRACKET193=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET194_tree = this.adaptor.create(LBRACKET194);
-            this.adaptor.addChild(root_0, LBRACKET194_tree);
+            LBRACKET193_tree = this.adaptor.create(LBRACKET193);
+            this.adaptor.addChild(root_0, LBRACKET193_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5409);
-            p_TryTargetExpr195=this.p_TryTargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5413);
+            p_TryTargetExpr194=this.p_TryTargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr195.getTree());
-            RBRACKET196=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr194.getTree());
+            RBRACKET195=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5415); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET196_tree = this.adaptor.create(RBRACKET196);
-            this.adaptor.addChild(root_0, RBRACKET196_tree);
+            RBRACKET195_tree = this.adaptor.create(RBRACKET195);
+            this.adaptor.addChild(root_0, RBRACKET195_tree);
             }
 
 
@@ -30478,7 +30484,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:778:1: p_TryTargetExpr : p_Expr[false,false] ;
+    // xquery/XQueryParser.g:780:1: p_TryTargetExpr : p_Expr[false,false] ;
     // $ANTLR start "p_TryTargetExpr"
     p_TryTargetExpr: function() {
         var retval = new XQueryParser.p_TryTargetExpr_return();
@@ -30486,20 +30492,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr197 = null;
+         var p_Expr196 = null;
 
 
         try {
-            // xquery/XQueryParser.g:779:9: ( p_Expr[false,false] )
-            // xquery/XQueryParser.g:779:11: p_Expr[false,false]
+            // xquery/XQueryParser.g:781:9: ( p_Expr[false,false] )
+            // xquery/XQueryParser.g:781:11: p_Expr[false,false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5437);
-            p_Expr197=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5441);
+            p_Expr196=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr197.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr196.getTree());
 
 
 
@@ -30536,7 +30542,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:783:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
+    // xquery/XQueryParser.g:785:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
     // $ANTLR start "p_CatchClause"
     p_CatchClause: function() {
         var retval = new XQueryParser.p_CatchClause_return();
@@ -30545,21 +30551,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET199 = null;
-        var RBRACKET201 = null;
-         var p_CatchErrorList198 = null;
-         var p_Expr200 = null;
+        var LBRACKET198 = null;
+        var RBRACKET200 = null;
+         var p_CatchErrorList197 = null;
+         var p_Expr199 = null;
 
         var k_tree=null;
-        var LBRACKET199_tree=null;
-        var RBRACKET201_tree=null;
+        var LBRACKET198_tree=null;
+        var RBRACKET200_tree=null;
 
         try {
-            // xquery/XQueryParser.g:784:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
-            // xquery/XQueryParser.g:784:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
+            // xquery/XQueryParser.g:786:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
+            // xquery/XQueryParser.g:786:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5466); if (this.state.failed) return retval;
+            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30567,27 +30573,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5470);
-            p_CatchErrorList198=this.p_CatchErrorList();
+            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5474);
+            p_CatchErrorList197=this.p_CatchErrorList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList198.getTree());
-            LBRACKET199=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5472); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList197.getTree());
+            LBRACKET198=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET199_tree = this.adaptor.create(LBRACKET199);
-            this.adaptor.addChild(root_0, LBRACKET199_tree);
+            LBRACKET198_tree = this.adaptor.create(LBRACKET198);
+            this.adaptor.addChild(root_0, LBRACKET198_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5474);
-            p_Expr200=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5478);
+            p_Expr199=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr200.getTree());
-            RBRACKET201=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5477); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr199.getTree());
+            RBRACKET200=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5481); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET201_tree = this.adaptor.create(RBRACKET201);
-            this.adaptor.addChild(root_0, RBRACKET201_tree);
+            RBRACKET200_tree = this.adaptor.create(RBRACKET200);
+            this.adaptor.addChild(root_0, RBRACKET200_tree);
             }
 
 
@@ -30625,7 +30631,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:788:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
+    // xquery/XQueryParser.g:790:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
     // $ANTLR start "p_CatchErrorList"
     p_CatchErrorList: function() {
         var retval = new XQueryParser.p_CatchErrorList_return();
@@ -30633,14 +30639,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR203 = null;
-         var p_NameTest202 = null;
-         var p_NameTest204 = null;
+        var VBAR202 = null;
+         var p_NameTest201 = null;
+         var p_NameTest203 = null;
 
-        var VBAR203_tree=null;
+        var VBAR202_tree=null;
 
         try {
-            // xquery/XQueryParser.g:789:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
+            // xquery/XQueryParser.g:791:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
             var alt89=2;
             var LA89_0 = this.input.LA(1);
 
@@ -30659,16 +30665,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt89) {
                 case 1 :
-                    // xquery/XQueryParser.g:789:11: p_NameTest ( VBAR p_NameTest )*
+                    // xquery/XQueryParser.g:791:11: p_NameTest ( VBAR p_NameTest )*
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5503);
-                    p_NameTest202=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5507);
+                    p_NameTest201=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest202.getTree());
-                    // xquery/XQueryParser.g:789:22: ( VBAR p_NameTest )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest201.getTree());
+                    // xquery/XQueryParser.g:791:22: ( VBAR p_NameTest )*
                     loop88:
                     do {
                         var alt88=2;
@@ -30681,18 +30687,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt88) {
                         case 1 :
-                            // xquery/XQueryParser.g:789:23: VBAR p_NameTest
-                            VBAR203=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5506); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:791:23: VBAR p_NameTest
+                            VBAR202=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5510); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR203_tree = this.adaptor.create(VBAR203);
-                            this.adaptor.addChild(root_0, VBAR203_tree);
+                            VBAR202_tree = this.adaptor.create(VBAR202);
+                            this.adaptor.addChild(root_0, VBAR202_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5508);
-                            p_NameTest204=this.p_NameTest();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5512);
+                            p_NameTest203=this.p_NameTest();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest204.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest203.getTree());
 
 
                             break;
@@ -30706,15 +30712,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:790:11: {...}? => ()
+                    // xquery/XQueryParser.g:792:11: {...}? => ()
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_CatchErrorList", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:790:29: ()
-                    // xquery/XQueryParser.g:790:43: 
+                    // xquery/XQueryParser.g:792:29: ()
+                    // xquery/XQueryParser.g:792:43: 
 
 
 
@@ -30755,7 +30761,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:794:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
+    // xquery/XQueryParser.g:796:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
     // $ANTLR start "p_OrExpr"
     p_OrExpr: function() {
         var retval = new XQueryParser.p_OrExpr_return();
@@ -30764,23 +30770,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AndExpr204 = null;
          var p_AndExpr205 = null;
-         var p_AndExpr206 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:795:9: ( p_AndExpr (k= OR p_AndExpr )* )
-            // xquery/XQueryParser.g:795:11: p_AndExpr (k= OR p_AndExpr )*
+            // xquery/XQueryParser.g:797:9: ( p_AndExpr (k= OR p_AndExpr )* )
+            // xquery/XQueryParser.g:797:11: p_AndExpr (k= OR p_AndExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5553);
-            p_AndExpr205=this.p_AndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5557);
+            p_AndExpr204=this.p_AndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
-            // xquery/XQueryParser.g:795:21: (k= OR p_AndExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr204.getTree());
+            // xquery/XQueryParser.g:797:21: (k= OR p_AndExpr )*
             loop90:
             do {
                 var alt90=2;
@@ -30793,8 +30799,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt90) {
                 case 1 :
-                    // xquery/XQueryParser.g:795:23: k= OR p_AndExpr
-                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5559); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:797:23: k= OR p_AndExpr
+                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5563); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30802,12 +30808,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5563);
-                    p_AndExpr206=this.p_AndExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5567);
+                    p_AndExpr205=this.p_AndExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr206.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
 
 
                     break;
@@ -30853,7 +30859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:799:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
+    // xquery/XQueryParser.g:801:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
     // $ANTLR start "p_AndExpr"
     p_AndExpr: function() {
         var retval = new XQueryParser.p_AndExpr_return();
@@ -30862,23 +30868,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_ComparisonExpr206 = null;
          var p_ComparisonExpr207 = null;
-         var p_ComparisonExpr208 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:800:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
-            // xquery/XQueryParser.g:800:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
+            // xquery/XQueryParser.g:802:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
+            // xquery/XQueryParser.g:802:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5592);
-            p_ComparisonExpr207=this.p_ComparisonExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5596);
+            p_ComparisonExpr206=this.p_ComparisonExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
-            // xquery/XQueryParser.g:800:28: (k= AND p_ComparisonExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr206.getTree());
+            // xquery/XQueryParser.g:802:28: (k= AND p_ComparisonExpr )*
             loop91:
             do {
                 var alt91=2;
@@ -30891,8 +30897,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt91) {
                 case 1 :
-                    // xquery/XQueryParser.g:800:30: k= AND p_ComparisonExpr
-                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5598); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:802:30: k= AND p_ComparisonExpr
+                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30900,12 +30906,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5602);
-                    p_ComparisonExpr208=this.p_ComparisonExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5606);
+                    p_ComparisonExpr207=this.p_ComparisonExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr208.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
 
 
                     break;
@@ -30951,7 +30957,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:805:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
+    // xquery/XQueryParser.g:807:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
     // $ANTLR start "p_ComparisonExpr"
     p_ComparisonExpr: function() {
         var retval = new XQueryParser.p_ComparisonExpr_return();
@@ -30959,25 +30965,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTContainsExpr209 = null;
-         var p_ValueComp210 = null;
-         var p_GeneralComp211 = null;
-         var p_NodeComp212 = null;
-         var p_FTContainsExpr213 = null;
+         var p_FTContainsExpr208 = null;
+         var p_ValueComp209 = null;
+         var p_GeneralComp210 = null;
+         var p_NodeComp211 = null;
+         var p_FTContainsExpr212 = null;
 
 
         try {
-            // xquery/XQueryParser.g:806:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
-            // xquery/XQueryParser.g:806:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            // xquery/XQueryParser.g:808:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
+            // xquery/XQueryParser.g:808:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632);
-            p_FTContainsExpr209=this.p_FTContainsExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636);
+            p_FTContainsExpr208=this.p_FTContainsExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr209.getTree());
-            // xquery/XQueryParser.g:806:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr208.getTree());
+            // xquery/XQueryParser.g:808:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             var alt93=2;
             var LA93_0 = this.input.LA(1);
 
@@ -30986,8 +30992,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt93) {
                 case 1 :
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
                     var alt92=3;
                     switch ( this.input.LA(1) ) {
                     case EQ:
@@ -31021,47 +31027,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     switch (alt92) {
                         case 1 :
-                            // xquery/XQueryParser.g:806:31: p_ValueComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5637);
-                            p_ValueComp210=this.p_ValueComp();
+                            // xquery/XQueryParser.g:808:31: p_ValueComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5641);
+                            p_ValueComp209=this.p_ValueComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp210.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp209.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:806:45: p_GeneralComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641);
-                            p_GeneralComp211=this.p_GeneralComp();
+                            // xquery/XQueryParser.g:808:45: p_GeneralComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645);
+                            p_GeneralComp210=this.p_GeneralComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp211.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp210.getTree());
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:806:61: p_NodeComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5645);
-                            p_NodeComp212=this.p_NodeComp();
+                            // xquery/XQueryParser.g:808:61: p_NodeComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5649);
+                            p_NodeComp211=this.p_NodeComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp212.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp211.getTree());
 
 
                             break;
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648);
-                    p_FTContainsExpr213=this.p_FTContainsExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652);
+                    p_FTContainsExpr212=this.p_FTContainsExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr213.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr212.getTree());
 
 
                     break;
@@ -31104,7 +31110,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:810:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
+    // xquery/XQueryParser.g:812:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
     // $ANTLR start "p_RangeExpr"
     p_RangeExpr: function() {
         var retval = new XQueryParser.p_RangeExpr_return();
@@ -31113,23 +31119,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AdditiveExpr213 = null;
          var p_AdditiveExpr214 = null;
-         var p_AdditiveExpr215 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:811:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
-            // xquery/XQueryParser.g:811:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
+            // xquery/XQueryParser.g:813:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
+            // xquery/XQueryParser.g:813:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677);
-            p_AdditiveExpr214=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681);
+            p_AdditiveExpr213=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
-            // xquery/XQueryParser.g:811:26: (k= TO p_AdditiveExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr213.getTree());
+            // xquery/XQueryParser.g:813:26: (k= TO p_AdditiveExpr )?
             var alt94=2;
             var LA94_0 = this.input.LA(1);
 
@@ -31138,8 +31144,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt94) {
                 case 1 :
-                    // xquery/XQueryParser.g:811:28: k= TO p_AdditiveExpr
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5683); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:813:28: k= TO p_AdditiveExpr
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31147,12 +31153,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687);
-                    p_AdditiveExpr215=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691);
+                    p_AdditiveExpr214=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr215.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
 
 
                     break;
@@ -31195,7 +31201,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:815:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
+    // xquery/XQueryParser.g:817:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
     // $ANTLR start "p_AdditiveExpr"
     p_AdditiveExpr: function() {
         var retval = new XQueryParser.p_AdditiveExpr_return();
@@ -31204,23 +31210,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
+         var p_MultiplicativeExpr215 = null;
          var p_MultiplicativeExpr216 = null;
-         var p_MultiplicativeExpr217 = null;
 
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:816:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
-            // xquery/XQueryParser.g:816:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            // xquery/XQueryParser.g:818:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
+            // xquery/XQueryParser.g:818:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716);
-            p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720);
+            p_MultiplicativeExpr215=this.p_MultiplicativeExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
-            // xquery/XQueryParser.g:816:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr215.getTree());
+            // xquery/XQueryParser.g:818:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             loop96:
             do {
                 var alt96=2;
@@ -31233,8 +31239,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt96) {
                 case 1 :
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS )
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS )
                     var alt95=2;
                     var LA95_0 = this.input.LA(1);
 
@@ -31253,8 +31259,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt95) {
                         case 1 :
-                            // xquery/XQueryParser.g:816:35: o= PLUS
-                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5723); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:35: o= PLUS
+                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5727); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31266,8 +31272,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:816:59: o= MINUS
-                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5731); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:59: o= MINUS
+                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5735); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31281,12 +31287,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736);
-                    p_MultiplicativeExpr217=this.p_MultiplicativeExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740);
+                    p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr217.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
 
 
                     break;
@@ -31332,7 +31338,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:820:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
+    // xquery/XQueryParser.g:822:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
     // $ANTLR start "p_MultiplicativeExpr"
     p_MultiplicativeExpr: function() {
         var retval = new XQueryParser.p_MultiplicativeExpr_return();
@@ -31342,24 +31348,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var o = null;
         var k = null;
+         var p_UnionExpr217 = null;
          var p_UnionExpr218 = null;
-         var p_UnionExpr219 = null;
 
         var o_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:821:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
-            // xquery/XQueryParser.g:821:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            // xquery/XQueryParser.g:823:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
+            // xquery/XQueryParser.g:823:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765);
-            p_UnionExpr218=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769);
+            p_UnionExpr217=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
-            // xquery/XQueryParser.g:821:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr217.getTree());
+            // xquery/XQueryParser.g:823:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             loop99:
             do {
                 var alt99=2;
@@ -31372,8 +31378,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt99) {
                 case 1 :
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
                     var alt98=2;
                     var LA98_0 = this.input.LA(1);
 
@@ -31392,8 +31398,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt98) {
                         case 1 :
-                            // xquery/XQueryParser.g:821:26: o= STAR
-                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5772); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:823:26: o= STAR
+                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5776); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -31405,8 +31411,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
                             var alt97=3;
                             switch ( this.input.LA(1) ) {
                             case DIV:
@@ -31428,8 +31434,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             switch (alt97) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:821:51: k= DIV
-                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5781); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:51: k= DIV
+                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5785); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31438,8 +31444,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:821:59: k= IDIV
-                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5787); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:59: k= IDIV
+                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5791); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31448,8 +31454,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 3 :
-                                    // xquery/XQueryParser.g:821:68: k= MOD
-                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5793); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:68: k= MOD
+                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5797); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -31469,12 +31475,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799);
-                    p_UnionExpr219=this.p_UnionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803);
+                    p_UnionExpr218=this.p_UnionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr219.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
 
 
                     break;
@@ -31520,7 +31526,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:825:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
+    // xquery/XQueryParser.g:827:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
     // $ANTLR start "p_UnionExpr"
     p_UnionExpr: function() {
         var retval = new XQueryParser.p_UnionExpr_return();
@@ -31529,25 +31535,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var VBAR221 = null;
-         var p_IntersectExceptExpr220 = null;
-         var p_IntersectExceptExpr222 = null;
+        var VBAR220 = null;
+         var p_IntersectExceptExpr219 = null;
+         var p_IntersectExceptExpr221 = null;
 
         var k_tree=null;
-        var VBAR221_tree=null;
+        var VBAR220_tree=null;
 
         try {
-            // xquery/XQueryParser.g:826:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
-            // xquery/XQueryParser.g:826:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            // xquery/XQueryParser.g:828:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
+            // xquery/XQueryParser.g:828:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828);
-            p_IntersectExceptExpr220=this.p_IntersectExceptExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832);
+            p_IntersectExceptExpr219=this.p_IntersectExceptExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr220.getTree());
-            // xquery/XQueryParser.g:826:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr219.getTree());
+            // xquery/XQueryParser.g:828:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             loop101:
             do {
                 var alt101=2;
@@ -31560,8 +31566,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt101) {
                 case 1 :
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR ) p_IntersectExceptExpr
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR )
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR ) p_IntersectExceptExpr
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR )
                     var alt100=2;
                     var LA100_0 = this.input.LA(1);
 
@@ -31580,8 +31586,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt100) {
                         case 1 :
-                            // xquery/XQueryParser.g:826:36: k= UNION
-                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5835); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:36: k= UNION
+                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5839); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31593,11 +31599,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:826:61: VBAR
-                            VBAR221=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5841); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:61: VBAR
+                            VBAR220=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5845); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR221_tree = this.adaptor.create(VBAR221);
-                            this.adaptor.addChild(root_0, VBAR221_tree);
+                            VBAR220_tree = this.adaptor.create(VBAR220);
+                            this.adaptor.addChild(root_0, VBAR220_tree);
                             }
 
 
@@ -31605,12 +31611,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844);
-                    p_IntersectExceptExpr222=this.p_IntersectExceptExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848);
+                    p_IntersectExceptExpr221=this.p_IntersectExceptExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr222.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr221.getTree());
 
 
                     break;
@@ -31656,7 +31662,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:830:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
+    // xquery/XQueryParser.g:832:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
     // $ANTLR start "p_IntersectExceptExpr"
     p_IntersectExceptExpr: function() {
         var retval = new XQueryParser.p_IntersectExceptExpr_return();
@@ -31665,23 +31671,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_InstanceofExpr222 = null;
          var p_InstanceofExpr223 = null;
-         var p_InstanceofExpr224 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:831:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
-            // xquery/XQueryParser.g:831:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            // xquery/XQueryParser.g:833:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
+            // xquery/XQueryParser.g:833:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873);
-            p_InstanceofExpr223=this.p_InstanceofExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877);
+            p_InstanceofExpr222=this.p_InstanceofExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
-            // xquery/XQueryParser.g:831:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr222.getTree());
+            // xquery/XQueryParser.g:833:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             loop103:
             do {
                 var alt103=2;
@@ -31694,8 +31700,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt103) {
                 case 1 :
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT )
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT )
                     var alt102=2;
                     var LA102_0 = this.input.LA(1);
 
@@ -31714,8 +31720,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt102) {
                         case 1 :
-                            // xquery/XQueryParser.g:831:31: k= INTERSECT
-                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:31: k= INTERSECT
+                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31724,8 +31730,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:831:45: k= EXCEPT
-                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:45: k= EXCEPT
+                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -31739,12 +31745,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891);
-                    p_InstanceofExpr224=this.p_InstanceofExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895);
+                    p_InstanceofExpr223=this.p_InstanceofExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr224.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
 
 
                     break;
@@ -31790,7 +31796,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:835:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
+    // xquery/XQueryParser.g:837:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
     // $ANTLR start "p_InstanceofExpr"
     p_InstanceofExpr: function() {
         var retval = new XQueryParser.p_InstanceofExpr_return();
@@ -31799,23 +31805,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TreatExpr225 = null;
-         var p_SequenceType226 = null;
+         var p_TreatExpr224 = null;
+         var p_SequenceType225 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:836:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
-            // xquery/XQueryParser.g:836:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
+            // xquery/XQueryParser.g:838:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
+            // xquery/XQueryParser.g:838:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920);
-            p_TreatExpr225=this.p_TreatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924);
+            p_TreatExpr224=this.p_TreatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr225.getTree());
-            // xquery/XQueryParser.g:836:23: (k= INSTANCE k= OF p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr224.getTree());
+            // xquery/XQueryParser.g:838:23: (k= INSTANCE k= OF p_SequenceType )?
             var alt104=2;
             var LA104_0 = this.input.LA(1);
 
@@ -31824,8 +31830,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt104) {
                 case 1 :
-                    // xquery/XQueryParser.g:836:25: k= INSTANCE k= OF p_SequenceType
-                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:838:25: k= INSTANCE k= OF p_SequenceType
+                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31833,7 +31839,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5932); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5936); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31841,12 +31847,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5936);
-                    p_SequenceType226=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5940);
+                    p_SequenceType225=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType226.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType225.getTree());
 
 
                     break;
@@ -31889,7 +31895,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:840:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
+    // xquery/XQueryParser.g:842:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
     // $ANTLR start "p_TreatExpr"
     p_TreatExpr: function() {
         var retval = new XQueryParser.p_TreatExpr_return();
@@ -31898,23 +31904,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastableExpr227 = null;
-         var p_SequenceType228 = null;
+         var p_CastableExpr226 = null;
+         var p_SequenceType227 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:841:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
-            // xquery/XQueryParser.g:841:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
+            // xquery/XQueryParser.g:843:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
+            // xquery/XQueryParser.g:843:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5964);
-            p_CastableExpr227=this.p_CastableExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5968);
+            p_CastableExpr226=this.p_CastableExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr227.getTree());
-            // xquery/XQueryParser.g:841:26: (k= TREAT k= AS p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr226.getTree());
+            // xquery/XQueryParser.g:843:26: (k= TREAT k= AS p_SequenceType )?
             var alt105=2;
             var LA105_0 = this.input.LA(1);
 
@@ -31923,8 +31929,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt105) {
                 case 1 :
-                    // xquery/XQueryParser.g:841:28: k= TREAT k= AS p_SequenceType
-                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5970); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:843:28: k= TREAT k= AS p_SequenceType
+                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31932,7 +31938,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5976); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -31940,12 +31946,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5980);
-                    p_SequenceType228=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5984);
+                    p_SequenceType227=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType228.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType227.getTree());
 
 
                     break;
@@ -31988,7 +31994,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:845:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:847:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
     // $ANTLR start "p_CastableExpr"
     p_CastableExpr: function() {
         var retval = new XQueryParser.p_CastableExpr_return();
@@ -31997,23 +32003,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastExpr229 = null;
-         var p_SingleType230 = null;
+         var p_CastExpr228 = null;
+         var p_SingleType229 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:846:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:846:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
+            // xquery/XQueryParser.g:848:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:848:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6017);
-            p_CastExpr229=this.p_CastExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6021);
+            p_CastExpr228=this.p_CastExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr229.getTree());
-            // xquery/XQueryParser.g:846:22: (k= CASTABLE k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr228.getTree());
+            // xquery/XQueryParser.g:848:22: (k= CASTABLE k= AS p_SingleType )?
             var alt106=2;
             var LA106_0 = this.input.LA(1);
 
@@ -32022,8 +32028,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt106) {
                 case 1 :
-                    // xquery/XQueryParser.g:846:24: k= CASTABLE k= AS p_SingleType
-                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6023); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:848:24: k= CASTABLE k= AS p_SingleType
+                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6027); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32031,7 +32037,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6029); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6033); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32039,12 +32045,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6033);
-                    p_SingleType230=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6037);
+                    p_SingleType229=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType230.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType229.getTree());
 
 
                     break;
@@ -32087,7 +32093,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:850:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:852:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
     // $ANTLR start "p_CastExpr"
     p_CastExpr: function() {
         var retval = new XQueryParser.p_CastExpr_return();
@@ -32096,23 +32102,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_UnaryExpr231 = null;
-         var p_SingleType232 = null;
+         var p_UnaryExpr230 = null;
+         var p_SingleType231 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:851:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:851:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
+            // xquery/XQueryParser.g:853:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:853:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6070);
-            p_UnaryExpr231=this.p_UnaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6074);
+            p_UnaryExpr230=this.p_UnaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr231.getTree());
-            // xquery/XQueryParser.g:851:23: (k= CAST k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr230.getTree());
+            // xquery/XQueryParser.g:853:23: (k= CAST k= AS p_SingleType )?
             var alt107=2;
             var LA107_0 = this.input.LA(1);
 
@@ -32121,8 +32127,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt107) {
                 case 1 :
-                    // xquery/XQueryParser.g:851:25: k= CAST k= AS p_SingleType
-                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6076); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:853:25: k= CAST k= AS p_SingleType
+                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6080); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32130,7 +32136,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6082); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6086); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32138,12 +32144,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6086);
-                    p_SingleType232=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6090);
+                    p_SingleType231=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType232.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType231.getTree());
 
 
                     break;
@@ -32186,7 +32192,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:855:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
+    // xquery/XQueryParser.g:857:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
     // $ANTLR start "p_UnaryExpr"
     p_UnaryExpr: function() {
         var retval = new XQueryParser.p_UnaryExpr_return();
@@ -32195,16 +32201,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
-         var p_ValueExpr233 = null;
+         var p_ValueExpr232 = null;
 
         var o_tree=null;
         var stream_PLUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token PLUS");
         var stream_MINUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token MINUS");
         var stream_p_ValueExpr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ValueExpr");
         try {
-            // xquery/XQueryParser.g:856:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )* p_ValueExpr
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )*
+            // xquery/XQueryParser.g:858:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )* p_ValueExpr
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )*
             loop108:
             do {
                 var alt108=3;
@@ -32220,8 +32226,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt108) {
                 case 1 :
-                    // xquery/XQueryParser.g:856:12: o= PLUS
-                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6118); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:12: o= PLUS
+                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6122); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_PLUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -32231,8 +32237,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:856:36: o= MINUS
-                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6126); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:36: o= MINUS
+                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6130); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_MINUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -32247,12 +32253,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6131);
-            p_ValueExpr233=this.p_ValueExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6135);
+            p_ValueExpr232=this.p_ValueExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr233.getTree());
+            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr232.getTree());
 
 
             // AST REWRITE
@@ -32266,14 +32272,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 857:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
+            // 859:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
             {
-                // xquery/XQueryParser.g:857:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
+                // xquery/XQueryParser.g:859:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(UnaryExpr, "UnaryExpr"), root_1);
 
-                // xquery/XQueryParser.g:857:32: ( PLUS )*
+                // xquery/XQueryParser.g:859:32: ( PLUS )*
                 while ( stream_PLUS.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_PLUS.nextNode());
 
@@ -32322,7 +32328,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:861:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
+    // xquery/XQueryParser.g:863:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
     // $ANTLR start "p_ValueExpr"
     p_ValueExpr: function() {
         var retval = new XQueryParser.p_ValueExpr_return();
@@ -32330,13 +32336,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ValidateExpr234 = null;
-         var p_PathExpr235 = null;
-         var p_ExtensionExpr236 = null;
+         var p_ValidateExpr233 = null;
+         var p_PathExpr234 = null;
+         var p_ExtensionExpr235 = null;
 
 
         try {
-            // xquery/XQueryParser.g:862:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
+            // xquery/XQueryParser.g:864:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
             var alt109=3;
             switch ( this.input.LA(1) ) {
             case VALIDATE:
@@ -32602,41 +32608,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt109) {
                 case 1 :
-                    // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
+                    // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6201);
-                    p_ValidateExpr234=this.p_ValidateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6205);
+                    p_ValidateExpr233=this.p_ValidateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr234.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr233.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:863:11: p_PathExpr
+                    // xquery/XQueryParser.g:865:11: p_PathExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6213);
-                    p_PathExpr235=this.p_PathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6217);
+                    p_PathExpr234=this.p_PathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr235.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr234.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:864:11: p_ExtensionExpr
+                    // xquery/XQueryParser.g:866:11: p_ExtensionExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225);
-                    p_ExtensionExpr236=this.p_ExtensionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229);
+                    p_ExtensionExpr235=this.p_ExtensionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr236.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr235.getTree());
 
 
                     break;
@@ -32675,7 +32681,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:868:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
+    // xquery/XQueryParser.g:870:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
     // $ANTLR start "p_GeneralComp"
     p_GeneralComp: function() {
         var retval = new XQueryParser.p_GeneralComp_return();
@@ -32688,11 +32694,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:869:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             var alt110=6;
             switch ( this.input.LA(1) ) {
             case EQUAL:
@@ -32723,8 +32729,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt110) {
                 case 1 :
-                    // xquery/XQueryParser.g:869:12: o= EQUAL
-                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6254); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:12: o= EQUAL
+                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6258); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32733,8 +32739,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:869:22: o= NOTEQUAL
-                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6260); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:22: o= NOTEQUAL
+                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6264); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32743,8 +32749,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:869:35: o= SMALLER
-                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6266); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:35: o= SMALLER
+                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6270); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32753,8 +32759,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:869:47: o= SMALLEREQ
-                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6272); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:47: o= SMALLEREQ
+                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6276); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32763,8 +32769,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:869:61: o= GREATER
-                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6278); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:61: o= GREATER
+                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6282); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32773,8 +32779,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:869:73: o= GREATEREQ
-                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6284); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:73: o= GREATEREQ
+                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -32824,7 +32830,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:873:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
+    // xquery/XQueryParser.g:875:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
     // $ANTLR start "p_ValueComp"
     p_ValueComp: function() {
         var retval = new XQueryParser.p_ValueComp_return();
@@ -32837,11 +32843,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:874:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             var alt111=6;
             switch ( this.input.LA(1) ) {
             case EQ:
@@ -32872,8 +32878,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt111) {
                 case 1 :
-                    // xquery/XQueryParser.g:874:12: k= EQ
-                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6316); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:12: k= EQ
+                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6320); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32882,8 +32888,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:874:19: k= NE
-                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6322); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:19: k= NE
+                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6326); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32892,8 +32898,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:874:26: k= LT
-                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6328); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:26: k= LT
+                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6332); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32902,8 +32908,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:874:33: k= LE
-                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6334); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:33: k= LE
+                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6338); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32912,8 +32918,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:874:40: k= GT
-                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6340); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:40: k= GT
+                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6344); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32922,8 +32928,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:874:47: k= GE
-                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6346); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:47: k= GE
+                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6350); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32973,7 +32979,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:878:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
+    // xquery/XQueryParser.g:880:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
     // $ANTLR start "p_NodeComp"
     p_NodeComp: function() {
         var retval = new XQueryParser.p_NodeComp_return();
@@ -32982,15 +32988,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SMALLER_SMALLER237 = null;
-        var GREATER_GREATER238 = null;
+        var SMALLER_SMALLER236 = null;
+        var GREATER_GREATER237 = null;
 
         var k_tree=null;
-        var SMALLER_SMALLER237_tree=null;
-        var GREATER_GREATER238_tree=null;
+        var SMALLER_SMALLER236_tree=null;
+        var GREATER_GREATER237_tree=null;
 
         try {
-            // xquery/XQueryParser.g:879:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
+            // xquery/XQueryParser.g:881:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
             var alt112=3;
             switch ( this.input.LA(1) ) {
             case IS:
@@ -33012,10 +33018,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt112) {
                 case 1 :
-                    // xquery/XQueryParser.g:879:11: k= IS
+                    // xquery/XQueryParser.g:881:11: k= IS
                     root_0 = this.adaptor.nil();
 
-                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6377); if (this.state.failed) return retval;
+                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6381); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33027,25 +33033,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:879:33: SMALLER_SMALLER
+                    // xquery/XQueryParser.g:881:33: SMALLER_SMALLER
                     root_0 = this.adaptor.nil();
 
-                    SMALLER_SMALLER237=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383); if (this.state.failed) return retval;
+                    SMALLER_SMALLER236=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SMALLER_SMALLER237_tree = this.adaptor.create(SMALLER_SMALLER237);
-                    this.adaptor.addChild(root_0, SMALLER_SMALLER237_tree);
+                    SMALLER_SMALLER236_tree = this.adaptor.create(SMALLER_SMALLER236);
+                    this.adaptor.addChild(root_0, SMALLER_SMALLER236_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:879:51: GREATER_GREATER
+                    // xquery/XQueryParser.g:881:51: GREATER_GREATER
                     root_0 = this.adaptor.nil();
 
-                    GREATER_GREATER238=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6387); if (this.state.failed) return retval;
+                    GREATER_GREATER237=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6391); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    GREATER_GREATER238_tree = this.adaptor.create(GREATER_GREATER238);
-                    this.adaptor.addChild(root_0, GREATER_GREATER238_tree);
+                    GREATER_GREATER237_tree = this.adaptor.create(GREATER_GREATER237);
+                    this.adaptor.addChild(root_0, GREATER_GREATER237_tree);
                     }
 
 
@@ -33085,7 +33091,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:883:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:885:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_ValidateExpr"
     p_ValidateExpr: function() {
         var retval = new XQueryParser.p_ValidateExpr_return();
@@ -33094,22 +33100,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET241 = null;
-        var RBRACKET243 = null;
-         var p_ValidationMode239 = null;
-         var p_TypeName240 = null;
-         var p_Expr242 = null;
+        var LBRACKET240 = null;
+        var RBRACKET242 = null;
+         var p_ValidationMode238 = null;
+         var p_TypeName239 = null;
+         var p_Expr241 = null;
 
         var k_tree=null;
-        var LBRACKET241_tree=null;
-        var RBRACKET243_tree=null;
+        var LBRACKET240_tree=null;
+        var RBRACKET242_tree=null;
 
         try {
-            // xquery/XQueryParser.g:884:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:884:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:886:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:886:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6415); if (this.state.failed) return retval;
+            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6419); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33117,7 +33123,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:884:37: ( p_ValidationMode | k= TYPE p_TypeName )?
+            // xquery/XQueryParser.g:886:37: ( p_ValidationMode | k= TYPE p_TypeName )?
             var alt113=3;
             var LA113_0 = this.input.LA(1);
 
@@ -33129,19 +33135,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt113) {
                 case 1 :
-                    // xquery/XQueryParser.g:884:39: p_ValidationMode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6421);
-                    p_ValidationMode239=this.p_ValidationMode();
+                    // xquery/XQueryParser.g:886:39: p_ValidationMode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6425);
+                    p_ValidationMode238=this.p_ValidationMode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode239.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode238.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:884:58: k= TYPE p_TypeName
-                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6427); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:886:58: k= TYPE p_TypeName
+                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6431); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33149,33 +33155,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6431);
-                    p_TypeName240=this.p_TypeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6435);
+                    p_TypeName239=this.p_TypeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName240.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName239.getTree());
 
 
                     break;
 
             }
 
-            LBRACKET241=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6436); if (this.state.failed) return retval;
+            LBRACKET240=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6440); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET241_tree = this.adaptor.create(LBRACKET241);
-            this.adaptor.addChild(root_0, LBRACKET241_tree);
+            LBRACKET240_tree = this.adaptor.create(LBRACKET240);
+            this.adaptor.addChild(root_0, LBRACKET240_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6438);
-            p_Expr242=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6442);
+            p_Expr241=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr242.getTree());
-            RBRACKET243=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6441); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr241.getTree());
+            RBRACKET242=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET243_tree = this.adaptor.create(RBRACKET243);
-            this.adaptor.addChild(root_0, RBRACKET243_tree);
+            RBRACKET242_tree = this.adaptor.create(RBRACKET242);
+            this.adaptor.addChild(root_0, RBRACKET242_tree);
             }
 
 
@@ -33213,7 +33219,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:888:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
+    // xquery/XQueryParser.g:890:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
     // $ANTLR start "p_ValidationMode"
     p_ValidationMode: function() {
         var retval = new XQueryParser.p_ValidationMode_return();
@@ -33226,11 +33232,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:889:9: ( (k= LAX | k= STRICT ) )
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:9: ( (k= LAX | k= STRICT ) )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             var alt114=2;
             var LA114_0 = this.input.LA(1);
 
@@ -33249,8 +33255,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt114) {
                 case 1 :
-                    // xquery/XQueryParser.g:889:12: k= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6470); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:12: k= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33259,8 +33265,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:889:20: k= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6476); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:20: k= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -33310,7 +33316,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:893:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
+    // xquery/XQueryParser.g:895:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
     // $ANTLR start "p_ExtensionExpr"
     p_ExtensionExpr: function() {
         var retval = new XQueryParser.p_ExtensionExpr_return();
@@ -33318,21 +33324,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma244 = null;
-        var LBRACKET245 = null;
-        var RBRACKET247 = null;
-         var p_Expr246 = null;
+        var L_Pragma243 = null;
+        var LBRACKET244 = null;
+        var RBRACKET246 = null;
+         var p_Expr245 = null;
 
-        var L_Pragma244_tree=null;
-        var LBRACKET245_tree=null;
-        var RBRACKET247_tree=null;
+        var L_Pragma243_tree=null;
+        var LBRACKET244_tree=null;
+        var RBRACKET246_tree=null;
 
         try {
-            // xquery/XQueryParser.g:894:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
+            // xquery/XQueryParser.g:896:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+
             var cnt115=0;
             loop115:
             do {
@@ -33346,11 +33352,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt115) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:11: L_Pragma
-                    L_Pragma244=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6505); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:896:11: L_Pragma
+                    L_Pragma243=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6509); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma244_tree = this.adaptor.create(L_Pragma244);
-                    this.adaptor.addChild(root_0, L_Pragma244_tree);
+                    L_Pragma243_tree = this.adaptor.create(L_Pragma243);
+                    this.adaptor.addChild(root_0, L_Pragma243_tree);
                     }
 
 
@@ -33367,12 +33373,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt115++;
             } while (true);
 
-            LBRACKET245=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6508); if (this.state.failed) return retval;
+            LBRACKET244=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET245_tree = this.adaptor.create(LBRACKET245);
-            this.adaptor.addChild(root_0, LBRACKET245_tree);
+            LBRACKET244_tree = this.adaptor.create(LBRACKET244);
+            this.adaptor.addChild(root_0, LBRACKET244_tree);
             }
-            // xquery/XQueryParser.g:894:30: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:896:30: ( p_Expr[true,true] )?
             var alt116=2;
             var LA116_0 = this.input.LA(1);
 
@@ -33381,23 +33387,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt116) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:30: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6510);
-                    p_Expr246=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:896:30: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6514);
+                    p_Expr245=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr246.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr245.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET247=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6514); if (this.state.failed) return retval;
+            RBRACKET246=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET247_tree = this.adaptor.create(RBRACKET247);
-            this.adaptor.addChild(root_0, RBRACKET247_tree);
+            RBRACKET246_tree = this.adaptor.create(RBRACKET246);
+            this.adaptor.addChild(root_0, RBRACKET246_tree);
             }
 
 
@@ -33435,7 +33441,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
+    // xquery/XQueryParser.g:908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
     // $ANTLR start "p_PathExpr"
     p_PathExpr: function() {
         var retval = new XQueryParser.p_PathExpr_return();
@@ -33443,39 +33449,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SLASH248 = null;
-        var SLASH250 = null;
-        var SLASH_SLASH251 = null;
-         var p_RelativePathExpr249 = null;
+        var SLASH247 = null;
+        var SLASH249 = null;
+        var SLASH_SLASH250 = null;
+         var p_RelativePathExpr248 = null;
+         var p_RelativePathExpr251 = null;
          var p_RelativePathExpr252 = null;
-         var p_RelativePathExpr253 = null;
 
-        var SLASH248_tree=null;
-        var SLASH250_tree=null;
-        var SLASH_SLASH251_tree=null;
+        var SLASH247_tree=null;
+        var SLASH249_tree=null;
+        var SLASH_SLASH250_tree=null;
 
         try {
-            // xquery/XQueryParser.g:907:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
+            // xquery/XQueryParser.g:909:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
             var alt117=4;
             alt117 = this.dfa117.predict(this.input);
             switch (alt117) {
                 case 1 :
-                    // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:907:41: ( SLASH p_RelativePathExpr )
-                    // xquery/XQueryParser.g:907:42: SLASH p_RelativePathExpr
-                    SLASH248=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6557); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:909:41: ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:42: SLASH p_RelativePathExpr
+                    SLASH247=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6561); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH248_tree = this.adaptor.create(SLASH248);
-                    this.adaptor.addChild(root_0, SLASH248_tree);
+                    SLASH247_tree = this.adaptor.create(SLASH247);
+                    this.adaptor.addChild(root_0, SLASH247_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6559);
-                    p_RelativePathExpr249=this.p_RelativePathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6563);
+                    p_RelativePathExpr248=this.p_RelativePathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr249.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr248.getTree());
 
 
 
@@ -33483,27 +33489,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:908:11: SLASH
+                    // xquery/XQueryParser.g:910:11: SLASH
                     root_0 = this.adaptor.nil();
 
-                    SLASH250=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6572); if (this.state.failed) return retval;
+                    SLASH249=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6576); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH250_tree = this.adaptor.create(SLASH250);
-                    this.adaptor.addChild(root_0, SLASH250_tree);
+                    SLASH249_tree = this.adaptor.create(SLASH249);
+                    this.adaptor.addChild(root_0, SLASH249_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:909:11: SLASH_SLASH p_RelativePathExpr
+                    // xquery/XQueryParser.g:911:11: SLASH_SLASH p_RelativePathExpr
                     root_0 = this.adaptor.nil();
 
-                    SLASH_SLASH251=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6584); if (this.state.failed) return retval;
+                    SLASH_SLASH250=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6588); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH_SLASH251_tree = this.adaptor.create(SLASH_SLASH251);
-                    this.adaptor.addChild(root_0, SLASH_SLASH251_tree);
+                    SLASH_SLASH250_tree = this.adaptor.create(SLASH_SLASH250);
+                    this.adaptor.addChild(root_0, SLASH_SLASH250_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6586);
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6590);
+                    p_RelativePathExpr251=this.p_RelativePathExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr251.getTree());
+
+
+                    break;
+                case 4 :
+                    // xquery/XQueryParser.g:912:11: p_RelativePathExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6602);
                     p_RelativePathExpr252=this.p_RelativePathExpr();
 
                     this.state._fsp--;
@@ -33511,19 +33530,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr252.getTree());
 
 
-                    break;
-                case 4 :
-                    // xquery/XQueryParser.g:910:11: p_RelativePathExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6598);
-                    p_RelativePathExpr253=this.p_RelativePathExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr253.getTree());
-
-
                     break;
 
             }
@@ -33560,7 +33566,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:914:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
+    // xquery/XQueryParser.g:916:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
     // $ANTLR start "p_RelativePathExpr"
     p_RelativePathExpr: function() {
         var retval = new XQueryParser.p_RelativePathExpr_return();
@@ -33568,24 +33574,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set255 = null;
-         var p_StepExpr254 = null;
-         var p_StepExpr256 = null;
+        var set254 = null;
+         var p_StepExpr253 = null;
+         var p_StepExpr255 = null;
 
-        var set255_tree=null;
+        var set254_tree=null;
 
         try {
-            // xquery/XQueryParser.g:915:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
-            // xquery/XQueryParser.g:915:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            // xquery/XQueryParser.g:917:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
+            // xquery/XQueryParser.g:917:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6626);
-            p_StepExpr254=this.p_StepExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6630);
+            p_StepExpr253=this.p_StepExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr254.getTree());
-            // xquery/XQueryParser.g:915:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr253.getTree());
+            // xquery/XQueryParser.g:917:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             loop118:
             do {
                 var alt118=2;
@@ -33598,11 +33604,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt118) {
                 case 1 :
-                    // xquery/XQueryParser.g:915:23: ( SLASH | SLASH_SLASH ) p_StepExpr
-                    set255=this.input.LT(1);
+                    // xquery/XQueryParser.g:917:23: ( SLASH | SLASH_SLASH ) p_StepExpr
+                    set254=this.input.LT(1);
                     if ( (this.input.LA(1)>=SLASH && this.input.LA(1)<=SLASH_SLASH) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set255));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set254));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -33611,12 +33617,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         throw mse;
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6637);
-                    p_StepExpr256=this.p_StepExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6641);
+                    p_StepExpr255=this.p_StepExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr256.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr255.getTree());
 
 
                     break;
@@ -33662,7 +33668,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
+    // xquery/XQueryParser.g:921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
     // $ANTLR start "p_StepExpr"
     p_StepExpr: function() {
         var retval = new XQueryParser.p_StepExpr_return();
@@ -33670,24 +33676,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+         var p_PostfixExpr256 = null;
          var p_PostfixExpr257 = null;
-         var p_PostfixExpr258 = null;
-         var p_AxisStep259 = null;
+         var p_AxisStep258 = null;
+         var p_PostfixExpr259 = null;
          var p_PostfixExpr260 = null;
-         var p_PostfixExpr261 = null;
-         var p_AxisStep262 = null;
+         var p_AxisStep261 = null;
 
 
         try {
-            // xquery/XQueryParser.g:920:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
+            // xquery/XQueryParser.g:922:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
             var alt119=6;
             alt119 = this.dfa119.predict(this.input);
             switch (alt119) {
                 case 1 :
-                    // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6691);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6695);
+                    p_PostfixExpr256=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr256.getTree());
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6809);
                     p_PostfixExpr257=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -33695,38 +33714,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr257.getTree());
 
 
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6805);
-                    p_PostfixExpr258=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr258.getTree());
-
-
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:926:11: ( p_KindTest )=> p_AxisStep
+                    // xquery/XQueryParser.g:928:11: ( p_KindTest )=> p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6823);
-                    p_AxisStep259=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6827);
+                    p_AxisStep258=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep259.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep258.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6844);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6848);
+                    p_PostfixExpr259=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr259.getTree());
+
+
+                    break;
+                case 5 :
+                    // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6866);
                     p_PostfixExpr260=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -33734,30 +33753,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr260.getTree());
 
 
-                    break;
-                case 5 :
-                    // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6862);
-                    p_PostfixExpr261=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr261.getTree());
-
-
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:929:11: p_AxisStep
+                    // xquery/XQueryParser.g:931:11: p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6874);
-                    p_AxisStep262=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6878);
+                    p_AxisStep261=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep262.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep261.getTree());
 
 
                     break;
@@ -33796,7 +33802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:933:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
+    // xquery/XQueryParser.g:935:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
     // $ANTLR start "p_AxisStep"
     p_AxisStep: function() {
         var retval = new XQueryParser.p_AxisStep_return();
@@ -33804,17 +33810,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseStep263 = null;
-         var p_ForwardStep264 = null;
-         var p_PredicateList265 = null;
+         var p_ReverseStep262 = null;
+         var p_ForwardStep263 = null;
+         var p_PredicateList264 = null;
 
 
         try {
-            // xquery/XQueryParser.g:934:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
+            // xquery/XQueryParser.g:936:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep )
             var alt120=2;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -34121,36 +34127,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt120) {
                 case 1 :
-                    // xquery/XQueryParser.g:934:12: p_ReverseStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6901);
-                    p_ReverseStep263=this.p_ReverseStep();
+                    // xquery/XQueryParser.g:936:12: p_ReverseStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6905);
+                    p_ReverseStep262=this.p_ReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep263.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep262.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:934:28: p_ForwardStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6905);
-                    p_ForwardStep264=this.p_ForwardStep();
+                    // xquery/XQueryParser.g:936:28: p_ForwardStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6909);
+                    p_ForwardStep263=this.p_ForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep264.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep263.getTree());
 
 
                     break;
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6908);
-            p_PredicateList265=this.p_PredicateList();
+            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6912);
+            p_PredicateList264=this.p_PredicateList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList265.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList264.getTree());
 
 
 
@@ -34187,7 +34193,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
+    // xquery/XQueryParser.g:940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
     // $ANTLR start "p_ForwardStep"
     p_ForwardStep: function() {
         var retval = new XQueryParser.p_ForwardStep_return();
@@ -34195,45 +34201,45 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ForwardAxis266 = null;
-         var p_NodeTest267 = null;
-         var p_AbbrevForwardStep268 = null;
+         var p_ForwardAxis265 = null;
+         var p_NodeTest266 = null;
+         var p_AbbrevForwardStep267 = null;
 
 
         try {
-            // xquery/XQueryParser.g:939:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
+            // xquery/XQueryParser.g:941:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
             var alt121=2;
             alt121 = this.dfa121.predict(this.input);
             switch (alt121) {
                 case 1 :
-                    // xquery/XQueryParser.g:939:11: p_ForwardAxis p_NodeTest
+                    // xquery/XQueryParser.g:941:11: p_ForwardAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6934);
-                    p_ForwardAxis266=this.p_ForwardAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6938);
+                    p_ForwardAxis265=this.p_ForwardAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis266.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6936);
-                    p_NodeTest267=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis265.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6940);
+                    p_NodeTest266=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest267.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest266.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:940:11: p_AbbrevForwardStep
+                    // xquery/XQueryParser.g:942:11: p_AbbrevForwardStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948);
-                    p_AbbrevForwardStep268=this.p_AbbrevForwardStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952);
+                    p_AbbrevForwardStep267=this.p_AbbrevForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep268.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep267.getTree());
 
 
                     break;
@@ -34272,7 +34278,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:944:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
+    // xquery/XQueryParser.g:946:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
     // $ANTLR start "p_ForwardAxis"
     p_ForwardAxis: function() {
         var retval = new XQueryParser.p_ForwardAxis_return();
@@ -34280,38 +34286,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CHILD269 = null;
-        var COLON_COLON270 = null;
-        var DESCENDANT271 = null;
-        var COLON_COLON272 = null;
-        var ATTRIBUTE273 = null;
-        var COLON_COLON274 = null;
-        var SELF275 = null;
-        var COLON_COLON276 = null;
-        var DESCENDANT_OR_SELF277 = null;
-        var COLON_COLON278 = null;
-        var FOLLOWING_SIBLING279 = null;
-        var COLON_COLON280 = null;
-        var FOLLOWING281 = null;
-        var COLON_COLON282 = null;
+        var CHILD268 = null;
+        var COLON_COLON269 = null;
+        var DESCENDANT270 = null;
+        var COLON_COLON271 = null;
+        var ATTRIBUTE272 = null;
+        var COLON_COLON273 = null;
+        var SELF274 = null;
+        var COLON_COLON275 = null;
+        var DESCENDANT_OR_SELF276 = null;
+        var COLON_COLON277 = null;
+        var FOLLOWING_SIBLING278 = null;
+        var COLON_COLON279 = null;
+        var FOLLOWING280 = null;
+        var COLON_COLON281 = null;
 
-        var CHILD269_tree=null;
-        var COLON_COLON270_tree=null;
-        var DESCENDANT271_tree=null;
-        var COLON_COLON272_tree=null;
-        var ATTRIBUTE273_tree=null;
-        var COLON_COLON274_tree=null;
-        var SELF275_tree=null;
-        var COLON_COLON276_tree=null;
-        var DESCENDANT_OR_SELF277_tree=null;
-        var COLON_COLON278_tree=null;
-        var FOLLOWING_SIBLING279_tree=null;
-        var COLON_COLON280_tree=null;
-        var FOLLOWING281_tree=null;
-        var COLON_COLON282_tree=null;
+        var CHILD268_tree=null;
+        var COLON_COLON269_tree=null;
+        var DESCENDANT270_tree=null;
+        var COLON_COLON271_tree=null;
+        var ATTRIBUTE272_tree=null;
+        var COLON_COLON273_tree=null;
+        var SELF274_tree=null;
+        var COLON_COLON275_tree=null;
+        var DESCENDANT_OR_SELF276_tree=null;
+        var COLON_COLON277_tree=null;
+        var FOLLOWING_SIBLING278_tree=null;
+        var COLON_COLON279_tree=null;
+        var FOLLOWING280_tree=null;
+        var COLON_COLON281_tree=null;
 
         try {
-            // xquery/XQueryParser.g:945:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
+            // xquery/XQueryParser.g:947:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
             var alt122=7;
             switch ( this.input.LA(1) ) {
             case CHILD:
@@ -34345,120 +34351,120 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt122) {
                 case 1 :
-                    // xquery/XQueryParser.g:945:11: CHILD COLON_COLON
+                    // xquery/XQueryParser.g:947:11: CHILD COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    CHILD269=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6974); if (this.state.failed) return retval;
+                    CHILD268=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6978); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CHILD269_tree = this.adaptor.create(CHILD269);
-                    this.adaptor.addChild(root_0, CHILD269_tree);
+                    CHILD268_tree = this.adaptor.create(CHILD268);
+                    this.adaptor.addChild(root_0, CHILD268_tree);
                     }
-                    COLON_COLON270=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6976); if (this.state.failed) return retval;
+                    COLON_COLON269=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON270_tree = this.adaptor.create(COLON_COLON270);
-                    this.adaptor.addChild(root_0, COLON_COLON270_tree);
+                    COLON_COLON269_tree = this.adaptor.create(COLON_COLON269);
+                    this.adaptor.addChild(root_0, COLON_COLON269_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:946:11: DESCENDANT COLON_COLON
+                    // xquery/XQueryParser.g:948:11: DESCENDANT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT271=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6988); if (this.state.failed) return retval;
+                    DESCENDANT270=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT271_tree = this.adaptor.create(DESCENDANT271);
-                    this.adaptor.addChild(root_0, DESCENDANT271_tree);
+                    DESCENDANT270_tree = this.adaptor.create(DESCENDANT270);
+                    this.adaptor.addChild(root_0, DESCENDANT270_tree);
                     }
-                    COLON_COLON272=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6990); if (this.state.failed) return retval;
+                    COLON_COLON271=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6994); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON272_tree = this.adaptor.create(COLON_COLON272);
-                    this.adaptor.addChild(root_0, COLON_COLON272_tree);
+                    COLON_COLON271_tree = this.adaptor.create(COLON_COLON271);
+                    this.adaptor.addChild(root_0, COLON_COLON271_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:947:11: ATTRIBUTE COLON_COLON
+                    // xquery/XQueryParser.g:949:11: ATTRIBUTE COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ATTRIBUTE273=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002); if (this.state.failed) return retval;
+                    ATTRIBUTE272=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTRIBUTE273_tree = this.adaptor.create(ATTRIBUTE273);
-                    this.adaptor.addChild(root_0, ATTRIBUTE273_tree);
+                    ATTRIBUTE272_tree = this.adaptor.create(ATTRIBUTE272);
+                    this.adaptor.addChild(root_0, ATTRIBUTE272_tree);
                     }
-                    COLON_COLON274=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7004); if (this.state.failed) return retval;
+                    COLON_COLON273=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7008); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON274_tree = this.adaptor.create(COLON_COLON274);
-                    this.adaptor.addChild(root_0, COLON_COLON274_tree);
+                    COLON_COLON273_tree = this.adaptor.create(COLON_COLON273);
+                    this.adaptor.addChild(root_0, COLON_COLON273_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:948:11: SELF COLON_COLON
+                    // xquery/XQueryParser.g:950:11: SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    SELF275=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7016); if (this.state.failed) return retval;
+                    SELF274=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7020); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SELF275_tree = this.adaptor.create(SELF275);
-                    this.adaptor.addChild(root_0, SELF275_tree);
+                    SELF274_tree = this.adaptor.create(SELF274);
+                    this.adaptor.addChild(root_0, SELF274_tree);
                     }
-                    COLON_COLON276=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7018); if (this.state.failed) return retval;
+                    COLON_COLON275=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7022); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON276_tree = this.adaptor.create(COLON_COLON276);
-                    this.adaptor.addChild(root_0, COLON_COLON276_tree);
+                    COLON_COLON275_tree = this.adaptor.create(COLON_COLON275);
+                    this.adaptor.addChild(root_0, COLON_COLON275_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:949:11: DESCENDANT_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:951:11: DESCENDANT_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT_OR_SELF277=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030); if (this.state.failed) return retval;
+                    DESCENDANT_OR_SELF276=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT_OR_SELF277_tree = this.adaptor.create(DESCENDANT_OR_SELF277);
-                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF277_tree);
+                    DESCENDANT_OR_SELF276_tree = this.adaptor.create(DESCENDANT_OR_SELF276);
+                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF276_tree);
                     }
-                    COLON_COLON278=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7032); if (this.state.failed) return retval;
+                    COLON_COLON277=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON278_tree = this.adaptor.create(COLON_COLON278);
-                    this.adaptor.addChild(root_0, COLON_COLON278_tree);
+                    COLON_COLON277_tree = this.adaptor.create(COLON_COLON277);
+                    this.adaptor.addChild(root_0, COLON_COLON277_tree);
                     }
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:950:11: FOLLOWING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:952:11: FOLLOWING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING_SIBLING279=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044); if (this.state.failed) return retval;
+                    FOLLOWING_SIBLING278=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING_SIBLING279_tree = this.adaptor.create(FOLLOWING_SIBLING279);
-                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING279_tree);
+                    FOLLOWING_SIBLING278_tree = this.adaptor.create(FOLLOWING_SIBLING278);
+                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING278_tree);
                     }
-                    COLON_COLON280=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7046); if (this.state.failed) return retval;
+                    COLON_COLON279=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7050); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON280_tree = this.adaptor.create(COLON_COLON280);
-                    this.adaptor.addChild(root_0, COLON_COLON280_tree);
+                    COLON_COLON279_tree = this.adaptor.create(COLON_COLON279);
+                    this.adaptor.addChild(root_0, COLON_COLON279_tree);
                     }
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:951:11: FOLLOWING COLON_COLON
+                    // xquery/XQueryParser.g:953:11: FOLLOWING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING281=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7058); if (this.state.failed) return retval;
+                    FOLLOWING280=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7062); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING281_tree = this.adaptor.create(FOLLOWING281);
-                    this.adaptor.addChild(root_0, FOLLOWING281_tree);
+                    FOLLOWING280_tree = this.adaptor.create(FOLLOWING280);
+                    this.adaptor.addChild(root_0, FOLLOWING280_tree);
                     }
-                    COLON_COLON282=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7060); if (this.state.failed) return retval;
+                    COLON_COLON281=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7064); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON282_tree = this.adaptor.create(COLON_COLON282);
-                    this.adaptor.addChild(root_0, COLON_COLON282_tree);
+                    COLON_COLON281_tree = this.adaptor.create(COLON_COLON281);
+                    this.adaptor.addChild(root_0, COLON_COLON281_tree);
                     }
 
 
@@ -34498,7 +34504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:955:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
+    // xquery/XQueryParser.g:957:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
     // $ANTLR start "p_AbbrevForwardStep"
     p_AbbrevForwardStep: function() {
         var retval = new XQueryParser.p_AbbrevForwardStep_return();
@@ -34506,17 +34512,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTR_SIGN283 = null;
-         var p_NodeTest284 = null;
+        var ATTR_SIGN282 = null;
+         var p_NodeTest283 = null;
 
-        var ATTR_SIGN283_tree=null;
+        var ATTR_SIGN282_tree=null;
 
         try {
-            // xquery/XQueryParser.g:956:9: ( ( ATTR_SIGN )? p_NodeTest )
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )? p_NodeTest
+            // xquery/XQueryParser.g:958:9: ( ( ATTR_SIGN )? p_NodeTest )
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )? p_NodeTest
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )?
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )?
             var alt123=2;
             var LA123_0 = this.input.LA(1);
 
@@ -34525,11 +34531,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt123) {
                 case 1 :
-                    // xquery/XQueryParser.g:956:11: ATTR_SIGN
-                    ATTR_SIGN283=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:958:11: ATTR_SIGN
+                    ATTR_SIGN282=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTR_SIGN283_tree = this.adaptor.create(ATTR_SIGN283);
-                    this.adaptor.addChild(root_0, ATTR_SIGN283_tree);
+                    ATTR_SIGN282_tree = this.adaptor.create(ATTR_SIGN282);
+                    this.adaptor.addChild(root_0, ATTR_SIGN282_tree);
                     }
 
 
@@ -34537,12 +34543,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089);
-            p_NodeTest284=this.p_NodeTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093);
+            p_NodeTest283=this.p_NodeTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest284.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest283.getTree());
 
 
 
@@ -34579,7 +34585,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:960:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
+    // xquery/XQueryParser.g:962:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
     // $ANTLR start "p_ReverseStep"
     p_ReverseStep: function() {
         var retval = new XQueryParser.p_ReverseStep_return();
@@ -34587,13 +34593,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseAxis285 = null;
-         var p_NodeTest286 = null;
-         var p_AbbrevReverseStep287 = null;
+         var p_ReverseAxis284 = null;
+         var p_NodeTest285 = null;
+         var p_AbbrevReverseStep286 = null;
 
 
         try {
-            // xquery/XQueryParser.g:961:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
+            // xquery/XQueryParser.g:963:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
             var alt124=2;
             var LA124_0 = this.input.LA(1);
 
@@ -34612,34 +34618,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt124) {
                 case 1 :
-                    // xquery/XQueryParser.g:961:11: p_ReverseAxis p_NodeTest
+                    // xquery/XQueryParser.g:963:11: p_ReverseAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7115);
-                    p_ReverseAxis285=this.p_ReverseAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7119);
+                    p_ReverseAxis284=this.p_ReverseAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis285.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7117);
-                    p_NodeTest286=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis284.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7121);
+                    p_NodeTest285=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest286.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest285.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:962:11: p_AbbrevReverseStep
+                    // xquery/XQueryParser.g:964:11: p_AbbrevReverseStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129);
-                    p_AbbrevReverseStep287=this.p_AbbrevReverseStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133);
+                    p_AbbrevReverseStep286=this.p_AbbrevReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep287.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep286.getTree());
 
 
                     break;
@@ -34678,7 +34684,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:966:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
+    // xquery/XQueryParser.g:968:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
     // $ANTLR start "p_ReverseAxis"
     p_ReverseAxis: function() {
         var retval = new XQueryParser.p_ReverseAxis_return();
@@ -34686,30 +34692,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PARENT288 = null;
-        var COLON_COLON289 = null;
-        var ANCESTOR290 = null;
-        var COLON_COLON291 = null;
-        var PRECEDING_SIBLING292 = null;
-        var COLON_COLON293 = null;
-        var PRECEDING294 = null;
-        var COLON_COLON295 = null;
-        var ANCESTOR_OR_SELF296 = null;
-        var COLON_COLON297 = null;
+        var PARENT287 = null;
+        var COLON_COLON288 = null;
+        var ANCESTOR289 = null;
+        var COLON_COLON290 = null;
+        var PRECEDING_SIBLING291 = null;
+        var COLON_COLON292 = null;
+        var PRECEDING293 = null;
+        var COLON_COLON294 = null;
+        var ANCESTOR_OR_SELF295 = null;
+        var COLON_COLON296 = null;
 
-        var PARENT288_tree=null;
-        var COLON_COLON289_tree=null;
-        var ANCESTOR290_tree=null;
-        var COLON_COLON291_tree=null;
-        var PRECEDING_SIBLING292_tree=null;
-        var COLON_COLON293_tree=null;
-        var PRECEDING294_tree=null;
-        var COLON_COLON295_tree=null;
-        var ANCESTOR_OR_SELF296_tree=null;
-        var COLON_COLON297_tree=null;
+        var PARENT287_tree=null;
+        var COLON_COLON288_tree=null;
+        var ANCESTOR289_tree=null;
+        var COLON_COLON290_tree=null;
+        var PRECEDING_SIBLING291_tree=null;
+        var COLON_COLON292_tree=null;
+        var PRECEDING293_tree=null;
+        var COLON_COLON294_tree=null;
+        var ANCESTOR_OR_SELF295_tree=null;
+        var COLON_COLON296_tree=null;
 
         try {
-            // xquery/XQueryParser.g:967:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
+            // xquery/XQueryParser.g:969:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
             var alt125=5;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -34737,86 +34743,86 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt125) {
                 case 1 :
-                    // xquery/XQueryParser.g:967:11: PARENT COLON_COLON
+                    // xquery/XQueryParser.g:969:11: PARENT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PARENT288=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7155); if (this.state.failed) return retval;
+                    PARENT287=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7159); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PARENT288_tree = this.adaptor.create(PARENT288);
-                    this.adaptor.addChild(root_0, PARENT288_tree);
+                    PARENT287_tree = this.adaptor.create(PARENT287);
+                    this.adaptor.addChild(root_0, PARENT287_tree);
                     }
-                    COLON_COLON289=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7157); if (this.state.failed) return retval;
+                    COLON_COLON288=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON289_tree = this.adaptor.create(COLON_COLON289);
-                    this.adaptor.addChild(root_0, COLON_COLON289_tree);
+                    COLON_COLON288_tree = this.adaptor.create(COLON_COLON288);
+                    this.adaptor.addChild(root_0, COLON_COLON288_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:968:11: ANCESTOR COLON_COLON
+                    // xquery/XQueryParser.g:970:11: ANCESTOR COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR290=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7169); if (this.state.failed) return retval;
+                    ANCESTOR289=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7173); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR290_tree = this.adaptor.create(ANCESTOR290);
-                    this.adaptor.addChild(root_0, ANCESTOR290_tree);
+                    ANCESTOR289_tree = this.adaptor.create(ANCESTOR289);
+                    this.adaptor.addChild(root_0, ANCESTOR289_tree);
                     }
-                    COLON_COLON291=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7171); if (this.state.failed) return retval;
+                    COLON_COLON290=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON291_tree = this.adaptor.create(COLON_COLON291);
-                    this.adaptor.addChild(root_0, COLON_COLON291_tree);
+                    COLON_COLON290_tree = this.adaptor.create(COLON_COLON290);
+                    this.adaptor.addChild(root_0, COLON_COLON290_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:969:11: PRECEDING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:971:11: PRECEDING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING_SIBLING292=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183); if (this.state.failed) return retval;
+                    PRECEDING_SIBLING291=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING_SIBLING292_tree = this.adaptor.create(PRECEDING_SIBLING292);
-                    this.adaptor.addChild(root_0, PRECEDING_SIBLING292_tree);
+                    PRECEDING_SIBLING291_tree = this.adaptor.create(PRECEDING_SIBLING291);
+                    this.adaptor.addChild(root_0, PRECEDING_SIBLING291_tree);
                     }
-                    COLON_COLON293=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7185); if (this.state.failed) return retval;
+                    COLON_COLON292=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7189); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON293_tree = this.adaptor.create(COLON_COLON293);
-                    this.adaptor.addChild(root_0, COLON_COLON293_tree);
+                    COLON_COLON292_tree = this.adaptor.create(COLON_COLON292);
+                    this.adaptor.addChild(root_0, COLON_COLON292_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:970:11: PRECEDING COLON_COLON
+                    // xquery/XQueryParser.g:972:11: PRECEDING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING294=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7197); if (this.state.failed) return retval;
+                    PRECEDING293=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING294_tree = this.adaptor.create(PRECEDING294);
-                    this.adaptor.addChild(root_0, PRECEDING294_tree);
+                    PRECEDING293_tree = this.adaptor.create(PRECEDING293);
+                    this.adaptor.addChild(root_0, PRECEDING293_tree);
                     }
-                    COLON_COLON295=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7199); if (this.state.failed) return retval;
+                    COLON_COLON294=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7203); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON295_tree = this.adaptor.create(COLON_COLON295);
-                    this.adaptor.addChild(root_0, COLON_COLON295_tree);
+                    COLON_COLON294_tree = this.adaptor.create(COLON_COLON294);
+                    this.adaptor.addChild(root_0, COLON_COLON294_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:971:11: ANCESTOR_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:973:11: ANCESTOR_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR_OR_SELF296=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211); if (this.state.failed) return retval;
+                    ANCESTOR_OR_SELF295=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR_OR_SELF296_tree = this.adaptor.create(ANCESTOR_OR_SELF296);
-                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF296_tree);
+                    ANCESTOR_OR_SELF295_tree = this.adaptor.create(ANCESTOR_OR_SELF295);
+                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF295_tree);
                     }
-                    COLON_COLON297=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7213); if (this.state.failed) return retval;
+                    COLON_COLON296=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7217); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON297_tree = this.adaptor.create(COLON_COLON297);
-                    this.adaptor.addChild(root_0, COLON_COLON297_tree);
+                    COLON_COLON296_tree = this.adaptor.create(COLON_COLON296);
+                    this.adaptor.addChild(root_0, COLON_COLON296_tree);
                     }
 
 
@@ -34856,7 +34862,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:975:1: p_AbbrevReverseStep : DOT_DOT ;
+    // xquery/XQueryParser.g:977:1: p_AbbrevReverseStep : DOT_DOT ;
     // $ANTLR start "p_AbbrevReverseStep"
     p_AbbrevReverseStep: function() {
         var retval = new XQueryParser.p_AbbrevReverseStep_return();
@@ -34864,19 +34870,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT_DOT298 = null;
+        var DOT_DOT297 = null;
 
-        var DOT_DOT298_tree=null;
+        var DOT_DOT297_tree=null;
 
         try {
-            // xquery/XQueryParser.g:976:9: ( DOT_DOT )
-            // xquery/XQueryParser.g:976:11: DOT_DOT
+            // xquery/XQueryParser.g:978:9: ( DOT_DOT )
+            // xquery/XQueryParser.g:978:11: DOT_DOT
             root_0 = this.adaptor.nil();
 
-            DOT_DOT298=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239); if (this.state.failed) return retval;
+            DOT_DOT297=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT_DOT298_tree = this.adaptor.create(DOT_DOT298);
-            this.adaptor.addChild(root_0, DOT_DOT298_tree);
+            DOT_DOT297_tree = this.adaptor.create(DOT_DOT297);
+            this.adaptor.addChild(root_0, DOT_DOT297_tree);
             }
 
 
@@ -34914,7 +34920,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:980:1: p_NodeTest : ( p_KindTest | p_NameTest );
+    // xquery/XQueryParser.g:982:1: p_NodeTest : ( p_KindTest | p_NameTest );
     // $ANTLR start "p_NodeTest"
     p_NodeTest: function() {
         var retval = new XQueryParser.p_NodeTest_return();
@@ -34922,38 +34928,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_KindTest299 = null;
-         var p_NameTest300 = null;
+         var p_KindTest298 = null;
+         var p_NameTest299 = null;
 
 
         try {
-            // xquery/XQueryParser.g:981:9: ( p_KindTest | p_NameTest )
+            // xquery/XQueryParser.g:983:9: ( p_KindTest | p_NameTest )
             var alt126=2;
             alt126 = this.dfa126.predict(this.input);
             switch (alt126) {
                 case 1 :
-                    // xquery/XQueryParser.g:981:11: p_KindTest
+                    // xquery/XQueryParser.g:983:11: p_KindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7265);
-                    p_KindTest299=this.p_KindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7269);
+                    p_KindTest298=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest299.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest298.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:981:24: p_NameTest
+                    // xquery/XQueryParser.g:983:24: p_NameTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7269);
-                    p_NameTest300=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7273);
+                    p_NameTest299=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest300.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest299.getTree());
 
 
                     break;
@@ -34992,7 +34998,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:985:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
+    // xquery/XQueryParser.g:987:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
     // $ANTLR start "p_NameTest"
     p_NameTest: function() {
         var retval = new XQueryParser.p_NameTest_return();
@@ -35000,13 +35006,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Wildcard301 = null;
+         var p_Wildcard300 = null;
+         var p_QName301 = null;
          var p_QName302 = null;
-         var p_QName303 = null;
 
 
         try {
-            // xquery/XQueryParser.g:986:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
+            // xquery/XQueryParser.g:988:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
             var alt127=3;
             var LA127_0 = this.input.LA(1);
 
@@ -35048,23 +35054,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt127) {
                 case 1 :
-                    // xquery/XQueryParser.g:986:11: ( p_Wildcard )=> p_Wildcard
+                    // xquery/XQueryParser.g:988:11: ( p_Wildcard )=> p_Wildcard
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7301);
-                    p_Wildcard301=this.p_Wildcard();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7305);
+                    p_Wildcard300=this.p_Wildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard301.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard300.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:987:11: ( p_NCName COLON )=> p_QName
+                    // xquery/XQueryParser.g:989:11: ( p_NCName COLON )=> p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7322);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7326);
+                    p_QName301=this.p_QName();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName301.getTree());
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:990:11: ( p_NCName )=> p_QName
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7344);
                     p_QName302=this.p_QName();
 
                     this.state._fsp--;
@@ -35072,19 +35091,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName302.getTree());
 
 
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:988:11: ( p_NCName )=> p_QName
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7340);
-                    p_QName303=this.p_QName();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName303.getTree());
-
-
                     break;
 
             }
@@ -35121,7 +35127,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:992:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
+    // xquery/XQueryParser.g:994:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
     // $ANTLR start "p_Wildcard"
     p_Wildcard: function() {
         var retval = new XQueryParser.p_Wildcard_return();
@@ -35129,26 +35135,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR304 = null;
-        var COLON305 = null;
-        var COLON308 = null;
-        var STAR309 = null;
-        var COLON311 = null;
-        var STAR312 = null;
+        var STAR303 = null;
+        var COLON304 = null;
+        var COLON307 = null;
+        var STAR308 = null;
+        var COLON310 = null;
+        var STAR311 = null;
+         var p_NCName305 = null;
          var p_NCName306 = null;
-         var p_NCName307 = null;
-         var p_StringLiteral310 = null;
+         var p_StringLiteral309 = null;
 
-        var STAR304_tree=null;
-        var COLON305_tree=null;
-        var COLON308_tree=null;
-        var STAR309_tree=null;
-        var COLON311_tree=null;
-        var STAR312_tree=null;
+        var STAR303_tree=null;
+        var COLON304_tree=null;
+        var COLON307_tree=null;
+        var STAR308_tree=null;
+        var COLON310_tree=null;
+        var STAR311_tree=null;
 
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:993:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
+            // xquery/XQueryParser.g:995:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
             var alt129=3;
             switch ( this.input.LA(1) ) {
             case STAR:
@@ -35375,15 +35381,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt129) {
                 case 1 :
-                    // xquery/XQueryParser.g:993:11: STAR ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:11: STAR ( COLON p_NCName )?
                     root_0 = this.adaptor.nil();
 
-                    STAR304=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7370); if (this.state.failed) return retval;
+                    STAR303=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR304_tree = this.adaptor.create(STAR304);
-                    this.adaptor.addChild(root_0, STAR304_tree);
+                    STAR303_tree = this.adaptor.create(STAR303);
+                    this.adaptor.addChild(root_0, STAR303_tree);
                     }
-                    // xquery/XQueryParser.g:993:16: ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:16: ( COLON p_NCName )?
                     var alt128=2;
                     var LA128_0 = this.input.LA(1);
 
@@ -35392,18 +35398,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt128) {
                         case 1 :
-                            // xquery/XQueryParser.g:993:17: COLON p_NCName
-                            COLON305=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7373); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:995:17: COLON p_NCName
+                            COLON304=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7377); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COLON305_tree = this.adaptor.create(COLON305);
-                            this.adaptor.addChild(root_0, COLON305_tree);
+                            COLON304_tree = this.adaptor.create(COLON304);
+                            this.adaptor.addChild(root_0, COLON304_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7375);
-                            p_NCName306=this.p_NCName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7379);
+                            p_NCName305=this.p_NCName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName305.getTree());
 
 
                             break;
@@ -35414,47 +35420,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:994:11: p_NCName COLON STAR
+                    // xquery/XQueryParser.g:996:11: p_NCName COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7389);
-                    p_NCName307=this.p_NCName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7393);
+                    p_NCName306=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName307.getTree());
-                    COLON308=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7391); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                    COLON307=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7395); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON308_tree = this.adaptor.create(COLON308);
-                    this.adaptor.addChild(root_0, COLON308_tree);
+                    COLON307_tree = this.adaptor.create(COLON307);
+                    this.adaptor.addChild(root_0, COLON307_tree);
                     }
-                    STAR309=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7393); if (this.state.failed) return retval;
+                    STAR308=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7397); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR309_tree = this.adaptor.create(STAR309);
-                    this.adaptor.addChild(root_0, STAR309_tree);
+                    STAR308_tree = this.adaptor.create(STAR308);
+                    this.adaptor.addChild(root_0, STAR308_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:995:11: p_StringLiteral COLON STAR
+                    // xquery/XQueryParser.g:997:11: p_StringLiteral COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7405);
-                    p_StringLiteral310=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7409);
+                    p_StringLiteral309=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral310.getTree());
-                    COLON311=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7407); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral309.getTree());
+                    COLON310=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7411); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON311_tree = this.adaptor.create(COLON311);
-                    this.adaptor.addChild(root_0, COLON311_tree);
+                    COLON310_tree = this.adaptor.create(COLON310);
+                    this.adaptor.addChild(root_0, COLON310_tree);
                     }
-                    STAR312=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7409); if (this.state.failed) return retval;
+                    STAR311=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7413); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR312_tree = this.adaptor.create(STAR312);
-                    this.adaptor.addChild(root_0, STAR312_tree);
+                    STAR311_tree = this.adaptor.create(STAR311);
+                    this.adaptor.addChild(root_0, STAR311_tree);
                     }
 
 
@@ -35495,7 +35501,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1000:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1002:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
     // $ANTLR start "p_PostfixExpr"
     p_PostfixExpr: function() {
         var retval = new XQueryParser.p_PostfixExpr_return();
@@ -35503,22 +35509,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PrimaryExpr313 = null;
-         var p_Predicate314 = null;
+         var p_PrimaryExpr312 = null;
+         var p_Predicate313 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1001:9: ( p_PrimaryExpr ( p_Predicate )* )
-            // xquery/XQueryParser.g:1001:11: p_PrimaryExpr ( p_Predicate )*
+            // xquery/XQueryParser.g:1003:9: ( p_PrimaryExpr ( p_Predicate )* )
+            // xquery/XQueryParser.g:1003:11: p_PrimaryExpr ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447);
-            p_PrimaryExpr313=this.p_PrimaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451);
+            p_PrimaryExpr312=this.p_PrimaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr313.getTree());
-            // xquery/XQueryParser.g:1001:25: ( p_Predicate )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr312.getTree());
+            // xquery/XQueryParser.g:1003:25: ( p_Predicate )*
             loop130:
             do {
                 var alt130=2;
@@ -35531,13 +35537,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt130) {
                 case 1 :
-                    // xquery/XQueryParser.g:1001:26: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7450);
-                    p_Predicate314=this.p_Predicate();
+                    // xquery/XQueryParser.g:1003:26: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7454);
+                    p_Predicate313=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate314.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate313.getTree());
 
 
                     break;
@@ -35583,7 +35589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1008:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
+    // xquery/XQueryParser.g:1010:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
     // $ANTLR start "p_ArgumentList"
     p_ArgumentList: function() {
         var retval = new XQueryParser.p_ArgumentList_return();
@@ -35591,27 +35597,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN315 = null;
-        var COMMA317 = null;
-        var RPAREN319 = null;
-         var p_Argument316 = null;
-         var p_Argument318 = null;
+        var LPAREN314 = null;
+        var COMMA316 = null;
+        var RPAREN318 = null;
+         var p_Argument315 = null;
+         var p_Argument317 = null;
 
-        var LPAREN315_tree=null;
-        var COMMA317_tree=null;
-        var RPAREN319_tree=null;
+        var LPAREN314_tree=null;
+        var COMMA316_tree=null;
+        var RPAREN318_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1009:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
-            // xquery/XQueryParser.g:1009:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
+            // xquery/XQueryParser.g:1011:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
+            // xquery/XQueryParser.g:1011:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN315=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7491); if (this.state.failed) return retval;
+            LPAREN314=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7495); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN315_tree = this.adaptor.create(LPAREN315);
-            this.adaptor.addChild(root_0, LPAREN315_tree);
+            LPAREN314_tree = this.adaptor.create(LPAREN314);
+            this.adaptor.addChild(root_0, LPAREN314_tree);
             }
-            // xquery/XQueryParser.g:1009:18: ( p_Argument ( COMMA p_Argument )* )?
+            // xquery/XQueryParser.g:1011:18: ( p_Argument ( COMMA p_Argument )* )?
             var alt132=2;
             var LA132_0 = this.input.LA(1);
 
@@ -35620,14 +35626,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt132) {
                 case 1 :
-                    // xquery/XQueryParser.g:1009:19: p_Argument ( COMMA p_Argument )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7494);
-                    p_Argument316=this.p_Argument();
+                    // xquery/XQueryParser.g:1011:19: p_Argument ( COMMA p_Argument )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7498);
+                    p_Argument315=this.p_Argument();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument316.getTree());
-                    // xquery/XQueryParser.g:1009:30: ( COMMA p_Argument )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument315.getTree());
+                    // xquery/XQueryParser.g:1011:30: ( COMMA p_Argument )*
                     loop131:
                     do {
                         var alt131=2;
@@ -35640,18 +35646,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt131) {
                         case 1 :
-                            // xquery/XQueryParser.g:1009:31: COMMA p_Argument
-                            COMMA317=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7497); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1011:31: COMMA p_Argument
+                            COMMA316=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7501); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA317_tree = this.adaptor.create(COMMA317);
-                            this.adaptor.addChild(root_0, COMMA317_tree);
+                            COMMA316_tree = this.adaptor.create(COMMA316);
+                            this.adaptor.addChild(root_0, COMMA316_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7499);
-                            p_Argument318=this.p_Argument();
+                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7503);
+                            p_Argument317=this.p_Argument();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument318.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument317.getTree());
 
 
                             break;
@@ -35667,10 +35673,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN319=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7505); if (this.state.failed) return retval;
+            RPAREN318=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN319_tree = this.adaptor.create(RPAREN319);
-            this.adaptor.addChild(root_0, RPAREN319_tree);
+            RPAREN318_tree = this.adaptor.create(RPAREN318);
+            this.adaptor.addChild(root_0, RPAREN318_tree);
             }
 
 
@@ -35708,7 +35714,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1013:1: p_PredicateList : ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1015:1: p_PredicateList : ( p_Predicate )* ;
     // $ANTLR start "p_PredicateList"
     p_PredicateList: function() {
         var retval = new XQueryParser.p_PredicateList_return();
@@ -35716,15 +35722,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Predicate320 = null;
+         var p_Predicate319 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1014:9: ( ( p_Predicate )* )
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:9: ( ( p_Predicate )* )
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             loop133:
             do {
                 var alt133=2;
@@ -35737,13 +35743,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt133) {
                 case 1 :
-                    // xquery/XQueryParser.g:1014:11: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7531);
-                    p_Predicate320=this.p_Predicate();
+                    // xquery/XQueryParser.g:1016:11: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7535);
+                    p_Predicate319=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate320.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate319.getTree());
 
 
                     break;
@@ -35789,7 +35795,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1018:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
+    // xquery/XQueryParser.g:1020:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
     // $ANTLR start "p_Predicate"
     p_Predicate: function() {
         var retval = new XQueryParser.p_Predicate_return();
@@ -35797,33 +35803,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LSQUARE321 = null;
-        var RSQUARE323 = null;
-         var p_Expr322 = null;
+        var LSQUARE320 = null;
+        var RSQUARE322 = null;
+         var p_Expr321 = null;
 
-        var LSQUARE321_tree=null;
-        var RSQUARE323_tree=null;
+        var LSQUARE320_tree=null;
+        var RSQUARE322_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1019:9: ( LSQUARE p_Expr[true,true] RSQUARE )
-            // xquery/XQueryParser.g:1019:11: LSQUARE p_Expr[true,true] RSQUARE
+            // xquery/XQueryParser.g:1021:9: ( LSQUARE p_Expr[true,true] RSQUARE )
+            // xquery/XQueryParser.g:1021:11: LSQUARE p_Expr[true,true] RSQUARE
             root_0 = this.adaptor.nil();
 
-            LSQUARE321=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7558); if (this.state.failed) return retval;
+            LSQUARE320=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7562); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LSQUARE321_tree = this.adaptor.create(LSQUARE321);
-            this.adaptor.addChild(root_0, LSQUARE321_tree);
+            LSQUARE320_tree = this.adaptor.create(LSQUARE320);
+            this.adaptor.addChild(root_0, LSQUARE320_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7560);
-            p_Expr322=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7564);
+            p_Expr321=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr322.getTree());
-            RSQUARE323=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7563); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr321.getTree());
+            RSQUARE322=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7567); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RSQUARE323_tree = this.adaptor.create(RSQUARE323);
-            this.adaptor.addChild(root_0, RSQUARE323_tree);
+            RSQUARE322_tree = this.adaptor.create(RSQUARE322);
+            this.adaptor.addChild(root_0, RSQUARE322_tree);
             }
 
 
@@ -35861,7 +35867,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
+    // xquery/XQueryParser.g:1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
     // $ANTLR start "p_PrimaryExpr"
     p_PrimaryExpr: function() {
         var retval = new XQueryParser.p_PrimaryExpr_return();
@@ -35869,136 +35875,136 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ParenthesizedExpr324 = null;
-         var p_Literal325 = null;
-         var p_VarRef326 = null;
-         var p_ContextItemExpr327 = null;
-         var p_FunctionCall328 = null;
-         var p_OrderedExpr329 = null;
-         var p_UnorderedExpr330 = null;
-         var p_Constructor331 = null;
-         var p_BlockExpr332 = null;
+         var p_ParenthesizedExpr323 = null;
+         var p_Literal324 = null;
+         var p_VarRef325 = null;
+         var p_ContextItemExpr326 = null;
+         var p_FunctionCall327 = null;
+         var p_OrderedExpr328 = null;
+         var p_UnorderedExpr329 = null;
+         var p_Constructor330 = null;
+         var p_BlockExpr331 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1025:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
+            // xquery/XQueryParser.g:1027:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
             var alt134=9;
             alt134 = this.dfa134.predict(this.input);
             switch (alt134) {
                 case 1 :
-                    // xquery/XQueryParser.g:1025:11: ( LPAREN )=> p_ParenthesizedExpr
+                    // xquery/XQueryParser.g:1027:11: ( LPAREN )=> p_ParenthesizedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596);
-                    p_ParenthesizedExpr324=this.p_ParenthesizedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600);
+                    p_ParenthesizedExpr323=this.p_ParenthesizedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr324.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr323.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1026:11: p_Literal
+                    // xquery/XQueryParser.g:1028:11: p_Literal
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7608);
-                    p_Literal325=this.p_Literal();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7612);
+                    p_Literal324=this.p_Literal();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal325.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal324.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1027:11: p_VarRef
+                    // xquery/XQueryParser.g:1029:11: p_VarRef
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7620);
-                    p_VarRef326=this.p_VarRef();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7624);
+                    p_VarRef325=this.p_VarRef();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef326.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef325.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1028:11: p_ContextItemExpr
+                    // xquery/XQueryParser.g:1030:11: p_ContextItemExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632);
-                    p_ContextItemExpr327=this.p_ContextItemExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636);
+                    p_ContextItemExpr326=this.p_ContextItemExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr327.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr326.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1029:11: p_FunctionCall
+                    // xquery/XQueryParser.g:1031:11: p_FunctionCall
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644);
-                    p_FunctionCall328=this.p_FunctionCall();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648);
+                    p_FunctionCall327=this.p_FunctionCall();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall328.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall327.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1030:11: p_OrderedExpr
+                    // xquery/XQueryParser.g:1032:11: p_OrderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656);
-                    p_OrderedExpr329=this.p_OrderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660);
+                    p_OrderedExpr328=this.p_OrderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr329.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr328.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1031:11: p_UnorderedExpr
+                    // xquery/XQueryParser.g:1033:11: p_UnorderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668);
-                    p_UnorderedExpr330=this.p_UnorderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672);
+                    p_UnorderedExpr329=this.p_UnorderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr330.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr329.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1032:11: p_Constructor
+                    // xquery/XQueryParser.g:1034:11: p_Constructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7680);
-                    p_Constructor331=this.p_Constructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7684);
+                    p_Constructor330=this.p_Constructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor331.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor330.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1035:11: p_BlockExpr
+                    // xquery/XQueryParser.g:1037:11: p_BlockExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694);
-                    p_BlockExpr332=this.p_BlockExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698);
+                    p_BlockExpr331=this.p_BlockExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr332.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr331.getTree());
 
 
                     break;
@@ -36037,7 +36043,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1039:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
+    // xquery/XQueryParser.g:1041:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
     // $ANTLR start "p_Literal"
     p_Literal: function() {
         var retval = new XQueryParser.p_Literal_return();
@@ -36045,12 +36051,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NumericLiteral333 = null;
-         var p_StringLiteral334 = null;
+         var p_NumericLiteral332 = null;
+         var p_StringLiteral333 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1040:9: ( p_NumericLiteral | p_StringLiteral )
+            // xquery/XQueryParser.g:1042:9: ( p_NumericLiteral | p_StringLiteral )
             var alt135=2;
             var LA135_0 = this.input.LA(1);
 
@@ -36069,28 +36075,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt135) {
                 case 1 :
-                    // xquery/XQueryParser.g:1040:11: p_NumericLiteral
+                    // xquery/XQueryParser.g:1042:11: p_NumericLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7720);
-                    p_NumericLiteral333=this.p_NumericLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7724);
+                    p_NumericLiteral332=this.p_NumericLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral333.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral332.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1040:30: p_StringLiteral
+                    // xquery/XQueryParser.g:1042:30: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7724);
-                    p_StringLiteral334=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7728);
+                    p_StringLiteral333=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral334.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral333.getTree());
 
 
                     break;
@@ -36129,7 +36135,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1044:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
+    // xquery/XQueryParser.g:1046:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
     // $ANTLR start "p_NumericLiteral"
     p_NumericLiteral: function() {
         var retval = new XQueryParser.p_NumericLiteral_return();
@@ -36143,7 +36149,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1045:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
+            // xquery/XQueryParser.g:1047:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
             var alt136=3;
             switch ( this.input.LA(1) ) {
             case L_IntegerLiteral:
@@ -36165,10 +36171,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt136) {
                 case 1 :
-                    // xquery/XQueryParser.g:1045:11: d+= L_IntegerLiteral
+                    // xquery/XQueryParser.g:1047:11: d+= L_IntegerLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36183,10 +36189,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1045:48: d+= L_DecimalLiteral
+                    // xquery/XQueryParser.g:1047:48: d+= L_DecimalLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36201,10 +36207,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1045:85: d+= L_DoubleLiteral
+                    // xquery/XQueryParser.g:1047:85: d+= L_DoubleLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -36253,7 +36259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1049:1: p_VarRef : d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1051:1: p_VarRef : d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_VarRef"
     p_VarRef: function() {
         var retval = new XQueryParser.p_VarRef_return();
@@ -36267,16 +36273,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1050:9: (d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1050:11: d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1052:9: (d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1052:11: d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7806); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7810); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7810);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7814);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -36321,7 +36327,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1054:1: p_VarName : p_QName ;
+    // xquery/XQueryParser.g:1056:1: p_VarName : p_QName ;
     // $ANTLR start "p_VarName"
     p_VarName: function() {
         var retval = new XQueryParser.p_VarName_return();
@@ -36329,20 +36335,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName335 = null;
+         var p_QName334 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1055:9: ( p_QName )
-            // xquery/XQueryParser.g:1055:11: p_QName
+            // xquery/XQueryParser.g:1057:9: ( p_QName )
+            // xquery/XQueryParser.g:1057:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7838);
-            p_QName335=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7842);
+            p_QName334=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName335.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName334.getTree());
 
 
 
@@ -36379,7 +36385,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1059:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
+    // xquery/XQueryParser.g:1061:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
     // $ANTLR start "p_ParenthesizedExpr"
     p_ParenthesizedExpr: function() {
         var retval = new XQueryParser.p_ParenthesizedExpr_return();
@@ -36387,24 +36393,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN336 = null;
-        var RPAREN338 = null;
-         var p_Expr337 = null;
+        var LPAREN335 = null;
+        var RPAREN337 = null;
+         var p_Expr336 = null;
 
-        var LPAREN336_tree=null;
-        var RPAREN338_tree=null;
+        var LPAREN335_tree=null;
+        var RPAREN337_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1060:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
-            // xquery/XQueryParser.g:1060:11: LPAREN ( p_Expr[true,true] )? RPAREN
+            // xquery/XQueryParser.g:1062:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
+            // xquery/XQueryParser.g:1062:11: LPAREN ( p_Expr[true,true] )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN336=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7864); if (this.state.failed) return retval;
+            LPAREN335=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7868); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN336_tree = this.adaptor.create(LPAREN336);
-            this.adaptor.addChild(root_0, LPAREN336_tree);
+            LPAREN335_tree = this.adaptor.create(LPAREN335);
+            this.adaptor.addChild(root_0, LPAREN335_tree);
             }
-            // xquery/XQueryParser.g:1060:18: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:1062:18: ( p_Expr[true,true] )?
             var alt137=2;
             var LA137_0 = this.input.LA(1);
 
@@ -36413,23 +36419,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt137) {
                 case 1 :
-                    // xquery/XQueryParser.g:1060:18: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7866);
-                    p_Expr337=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:1062:18: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7870);
+                    p_Expr336=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr337.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr336.getTree());
 
 
                     break;
 
             }
 
-            RPAREN338=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7870); if (this.state.failed) return retval;
+            RPAREN337=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7874); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN338_tree = this.adaptor.create(RPAREN338);
-            this.adaptor.addChild(root_0, RPAREN338_tree);
+            RPAREN337_tree = this.adaptor.create(RPAREN337);
+            this.adaptor.addChild(root_0, RPAREN337_tree);
             }
 
 
@@ -36467,7 +36473,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1064:1: p_ContextItemExpr : DOT ;
+    // xquery/XQueryParser.g:1066:1: p_ContextItemExpr : DOT ;
     // $ANTLR start "p_ContextItemExpr"
     p_ContextItemExpr: function() {
         var retval = new XQueryParser.p_ContextItemExpr_return();
@@ -36475,19 +36481,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT339 = null;
+        var DOT338 = null;
 
-        var DOT339_tree=null;
+        var DOT338_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1065:9: ( DOT )
-            // xquery/XQueryParser.g:1065:11: DOT
+            // xquery/XQueryParser.g:1067:9: ( DOT )
+            // xquery/XQueryParser.g:1067:11: DOT
             root_0 = this.adaptor.nil();
 
-            DOT339=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7896); if (this.state.failed) return retval;
+            DOT338=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT339_tree = this.adaptor.create(DOT339);
-            this.adaptor.addChild(root_0, DOT339_tree);
+            DOT338_tree = this.adaptor.create(DOT338);
+            this.adaptor.addChild(root_0, DOT338_tree);
             }
 
 
@@ -36525,7 +36531,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1069:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1071:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_OrderedExpr"
     p_OrderedExpr: function() {
         var retval = new XQueryParser.p_OrderedExpr_return();
@@ -36534,20 +36540,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET340 = null;
-        var RBRACKET342 = null;
-         var p_Expr341 = null;
+        var LBRACKET339 = null;
+        var RBRACKET341 = null;
+         var p_Expr340 = null;
 
         var k_tree=null;
-        var LBRACKET340_tree=null;
-        var RBRACKET342_tree=null;
+        var LBRACKET339_tree=null;
+        var RBRACKET341_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1070:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1070:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1072:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1072:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7924); if (this.state.failed) return retval;
+            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7928); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -36555,21 +36561,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET340=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7928); if (this.state.failed) return retval;
+            LBRACKET339=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7932); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET340_tree = this.adaptor.create(LBRACKET340);
-            this.adaptor.addChild(root_0, LBRACKET340_tree);
+            LBRACKET339_tree = this.adaptor.create(LBRACKET339);
+            this.adaptor.addChild(root_0, LBRACKET339_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7930);
-            p_Expr341=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7934);
+            p_Expr340=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr341.getTree());
-            RBRACKET342=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7933); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr340.getTree());
+            RBRACKET341=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET342_tree = this.adaptor.create(RBRACKET342);
-            this.adaptor.addChild(root_0, RBRACKET342_tree);
+            RBRACKET341_tree = this.adaptor.create(RBRACKET341);
+            this.adaptor.addChild(root_0, RBRACKET341_tree);
             }
 
 
@@ -36607,7 +36613,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1074:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1076:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_UnorderedExpr"
     p_UnorderedExpr: function() {
         var retval = new XQueryParser.p_UnorderedExpr_return();
@@ -36616,20 +36622,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET343 = null;
-        var RBRACKET345 = null;
-         var p_Expr344 = null;
+        var LBRACKET342 = null;
+        var RBRACKET344 = null;
+         var p_Expr343 = null;
 
         var k_tree=null;
-        var LBRACKET343_tree=null;
-        var RBRACKET345_tree=null;
+        var LBRACKET342_tree=null;
+        var RBRACKET344_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1075:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1075:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1077:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1077:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7961); if (this.state.failed) return retval;
+            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -36637,21 +36643,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET343=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
+            LBRACKET342=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7969); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET343_tree = this.adaptor.create(LBRACKET343);
-            this.adaptor.addChild(root_0, LBRACKET343_tree);
+            LBRACKET342_tree = this.adaptor.create(LBRACKET342);
+            this.adaptor.addChild(root_0, LBRACKET342_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7967);
-            p_Expr344=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7971);
+            p_Expr343=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr344.getTree());
-            RBRACKET345=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7970); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr343.getTree());
+            RBRACKET344=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7974); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET345_tree = this.adaptor.create(RBRACKET345);
-            this.adaptor.addChild(root_0, RBRACKET345_tree);
+            RBRACKET344_tree = this.adaptor.create(RBRACKET344);
+            this.adaptor.addChild(root_0, RBRACKET344_tree);
             }
 
 
@@ -36689,7 +36695,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1080:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
+    // xquery/XQueryParser.g:1082:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
     // $ANTLR start "p_FunctionCall"
     p_FunctionCall: function() {
         var retval = new XQueryParser.p_FunctionCall_return();
@@ -36698,15 +36704,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
          var f = null;
-         var p_ArgumentList346 = null;
+         var p_ArgumentList345 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1081:9: (f= pg_FQName p_ArgumentList )
-            // xquery/XQueryParser.g:1081:11: f= pg_FQName p_ArgumentList
+            // xquery/XQueryParser.g:1083:9: (f= pg_FQName p_ArgumentList )
+            // xquery/XQueryParser.g:1083:11: f= pg_FQName p_ArgumentList
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall7999);
+            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall8003);
             f=this.pg_FQName();
 
             this.state._fsp--;
@@ -36715,12 +36721,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.af((f?f.start:null), (f?f.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8004);
-            p_ArgumentList346=this.p_ArgumentList();
+            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8008);
+            p_ArgumentList345=this.p_ArgumentList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList346.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList345.getTree());
 
 
 
@@ -36757,7 +36763,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1085:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
+    // xquery/XQueryParser.g:1087:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
     // $ANTLR start "p_Argument"
     p_Argument: function() {
         var retval = new XQueryParser.p_Argument_return();
@@ -36765,12 +36771,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle347 = null;
-         var p_ArgumentPlaceholder348 = null;
+         var p_ExprSingle346 = null;
+         var p_ArgumentPlaceholder347 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1086:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
+            // xquery/XQueryParser.g:1088:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
             var alt138=2;
             var LA138_0 = this.input.LA(1);
 
@@ -36789,28 +36795,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt138) {
                 case 1 :
-                    // xquery/XQueryParser.g:1086:11: p_ExprSingle[true]
+                    // xquery/XQueryParser.g:1088:11: p_ExprSingle[true]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8030);
-                    p_ExprSingle347=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8034);
+                    p_ExprSingle346=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle347.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle346.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1086:32: p_ArgumentPlaceholder
+                    // xquery/XQueryParser.g:1088:32: p_ArgumentPlaceholder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035);
-                    p_ArgumentPlaceholder348=this.p_ArgumentPlaceholder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039);
+                    p_ArgumentPlaceholder347=this.p_ArgumentPlaceholder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder348.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder347.getTree());
 
 
                     break;
@@ -36849,7 +36855,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1090:1: p_ArgumentPlaceholder : QUESTION ;
+    // xquery/XQueryParser.g:1092:1: p_ArgumentPlaceholder : QUESTION ;
     // $ANTLR start "p_ArgumentPlaceholder"
     p_ArgumentPlaceholder: function() {
         var retval = new XQueryParser.p_ArgumentPlaceholder_return();
@@ -36857,19 +36863,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION349 = null;
+        var QUESTION348 = null;
 
-        var QUESTION349_tree=null;
+        var QUESTION348_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1091:9: ( QUESTION )
-            // xquery/XQueryParser.g:1091:11: QUESTION
+            // xquery/XQueryParser.g:1093:9: ( QUESTION )
+            // xquery/XQueryParser.g:1093:11: QUESTION
             root_0 = this.adaptor.nil();
 
-            QUESTION349=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061); if (this.state.failed) return retval;
+            QUESTION348=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            QUESTION349_tree = this.adaptor.create(QUESTION349);
-            this.adaptor.addChild(root_0, QUESTION349_tree);
+            QUESTION348_tree = this.adaptor.create(QUESTION348);
+            this.adaptor.addChild(root_0, QUESTION348_tree);
             }
 
 
@@ -36907,7 +36913,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1095:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
+    // xquery/XQueryParser.g:1097:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
     // $ANTLR start "p_Constructor"
     p_Constructor: function() {
         var retval = new XQueryParser.p_Constructor_return();
@@ -36915,12 +36921,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor350 = null;
-         var p_ComputedConstructor351 = null;
+         var p_DirectConstructor349 = null;
+         var p_ComputedConstructor350 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1096:9: ( p_DirectConstructor | p_ComputedConstructor )
+            // xquery/XQueryParser.g:1098:9: ( p_DirectConstructor | p_ComputedConstructor )
             var alt139=2;
             var LA139_0 = this.input.LA(1);
 
@@ -36942,28 +36948,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt139) {
                 case 1 :
-                    // xquery/XQueryParser.g:1096:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1098:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8087);
-                    p_DirectConstructor350=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8091);
+                    p_DirectConstructor349=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor350.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor349.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1097:11: p_ComputedConstructor
+                    // xquery/XQueryParser.g:1099:11: p_ComputedConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8099);
-                    p_ComputedConstructor351=this.p_ComputedConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8103);
+                    p_ComputedConstructor350=this.p_ComputedConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor351.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor350.getTree());
 
 
                     break;
@@ -37002,7 +37008,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1101:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
+    // xquery/XQueryParser.g:1103:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
     // $ANTLR start "p_DirectConstructor"
     p_DirectConstructor: function() {
         var retval = new XQueryParser.p_DirectConstructor_return();
@@ -37010,13 +37016,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirElemConstructor352 = null;
-         var p_DirCommentConstructor353 = null;
-         var p_DirPIConstructor354 = null;
+         var p_DirElemConstructor351 = null;
+         var p_DirCommentConstructor352 = null;
+         var p_DirPIConstructor353 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1102:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
+            // xquery/XQueryParser.g:1104:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
             var alt140=3;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -37038,41 +37044,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt140) {
                 case 1 :
-                    // xquery/XQueryParser.g:1102:11: p_DirElemConstructor
+                    // xquery/XQueryParser.g:1104:11: p_DirElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125);
-                    p_DirElemConstructor352=this.p_DirElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129);
+                    p_DirElemConstructor351=this.p_DirElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor352.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor351.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1103:11: p_DirCommentConstructor
+                    // xquery/XQueryParser.g:1105:11: p_DirCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137);
-                    p_DirCommentConstructor353=this.p_DirCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141);
+                    p_DirCommentConstructor352=this.p_DirCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor353.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor352.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1104:11: p_DirPIConstructor
+                    // xquery/XQueryParser.g:1106:11: p_DirPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149);
-                    p_DirPIConstructor354=this.p_DirPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153);
+                    p_DirPIConstructor353=this.p_DirPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor354.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor353.getTree());
 
 
                     break;
@@ -37111,7 +37117,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1108:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
+    // xquery/XQueryParser.g:1110:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
     // $ANTLR start "p_DirElemConstructor"
     p_DirElemConstructor: function() {
         var retval = new XQueryParser.p_DirElemConstructor_return();
@@ -37119,23 +37125,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SMALLER355 = null;
-        var EMPTY_CLOSE_TAG357 = null;
-        var GREATER358 = null;
-        var CLOSE_TAG360 = null;
-        var S361 = null;
-        var GREATER362 = null;
+        var SMALLER354 = null;
+        var EMPTY_CLOSE_TAG356 = null;
+        var GREATER357 = null;
+        var CLOSE_TAG359 = null;
+        var S360 = null;
+        var GREATER361 = null;
          var ts = null;
          var te = null;
-         var p_DirAttributeList356 = null;
-         var pm_DirElemContent359 = null;
+         var p_DirAttributeList355 = null;
+         var pm_DirElemContent358 = null;
 
-        var SMALLER355_tree=null;
-        var EMPTY_CLOSE_TAG357_tree=null;
-        var GREATER358_tree=null;
-        var CLOSE_TAG360_tree=null;
-        var S361_tree=null;
-        var GREATER362_tree=null;
+        var SMALLER354_tree=null;
+        var EMPTY_CLOSE_TAG356_tree=null;
+        var GREATER357_tree=null;
+        var CLOSE_TAG359_tree=null;
+        var S360_tree=null;
+        var GREATER361_tree=null;
         var stream_CLOSE_TAG=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token CLOSE_TAG");
         var stream_GREATER=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token GREATER");
         var stream_S=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token S");
@@ -37145,15 +37151,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_DirElemContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_DirElemContent");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1109:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
-            // xquery/XQueryParser.g:1109:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
-            SMALLER355=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8176); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER355);
+            // xquery/XQueryParser.g:1111:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
+            // xquery/XQueryParser.g:1111:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            SMALLER354=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8180); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER354);
 
             if ( this.state.backtracking===0 ) {
               this.pushXMLLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8192);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8196);
             ts=this.p_QName();
 
             this.state._fsp--;
@@ -37162,13 +37168,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.at((ts?ts.start:null), (ts?ts.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197);
-            p_DirAttributeList356=this.p_DirAttributeList();
+            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201);
+            p_DirAttributeList355=this.p_DirAttributeList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList356.getTree());
-            // xquery/XQueryParser.g:1111:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList355.getTree());
+            // xquery/XQueryParser.g:1113:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
             var alt143=2;
             var LA143_0 = this.input.LA(1);
 
@@ -37187,21 +37193,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt143) {
                 case 1 :
-                    // xquery/XQueryParser.g:1111:12: EMPTY_CLOSE_TAG
-                    EMPTY_CLOSE_TAG357=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG357);
+                    // xquery/XQueryParser.g:1113:12: EMPTY_CLOSE_TAG
+                    EMPTY_CLOSE_TAG356=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG356);
 
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
-                    GREATER358=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8216); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER358);
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
+                    GREATER357=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8220); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER357);
 
-                    // xquery/XQueryParser.g:1111:39: ( pm_DirElemContent )*
+                    // xquery/XQueryParser.g:1113:39: ( pm_DirElemContent )*
                     loop141:
                     do {
                         var alt141=2;
@@ -37214,13 +37220,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt141) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:39: pm_DirElemContent
-                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218);
-                            pm_DirElemContent359=this.pm_DirElemContent();
+                            // xquery/XQueryParser.g:1113:39: pm_DirElemContent
+                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222);
+                            pm_DirElemContent358=this.pm_DirElemContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent359.getTree());
+                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent358.getTree());
 
 
                             break;
@@ -37230,10 +37236,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    CLOSE_TAG360=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG360);
+                    CLOSE_TAG359=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG359);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8225);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8229);
                     te=this.p_QName();
 
                     this.state._fsp--;
@@ -37242,7 +37248,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.at((te?te.start:null), (te?te.stop:null));
                     }
-                    // xquery/XQueryParser.g:1111:111: ( S )?
+                    // xquery/XQueryParser.g:1113:111: ( S )?
                     var alt142=2;
                     var LA142_0 = this.input.LA(1);
 
@@ -37251,9 +37257,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt142) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:111: S
-                            S361=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8229); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_S.add(S361);
+                            // xquery/XQueryParser.g:1113:111: S
+                            S360=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8233); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_S.add(S360);
 
 
 
@@ -37261,8 +37267,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    GREATER362=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8232); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER362);
+                    GREATER361=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8236); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER361);
 
 
 
@@ -37276,7 +37282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_DirAttributeList, pm_DirElemContent
+            // elements: pm_DirElemContent, p_DirAttributeList
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -37286,19 +37292,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1112:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+            // 1114:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
             {
-                // xquery/XQueryParser.g:1112:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+                // xquery/XQueryParser.g:1114:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirElemConstructor, "DirElemConstructor"), root_1);
 
-                // xquery/XQueryParser.g:1112:41: ^( DirAttributeList ( p_DirAttributeList )* )
+                // xquery/XQueryParser.g:1114:41: ^( DirAttributeList ( p_DirAttributeList )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeList, "DirAttributeList"), root_2);
 
-                // xquery/XQueryParser.g:1112:60: ( p_DirAttributeList )*
+                // xquery/XQueryParser.g:1114:60: ( p_DirAttributeList )*
                 while ( stream_p_DirAttributeList.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_p_DirAttributeList.nextTree());
 
@@ -37307,12 +37313,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:1112:81: ^( DirElemContent ( pm_DirElemContent )* )
+                // xquery/XQueryParser.g:1114:81: ^( DirElemContent ( pm_DirElemContent )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirElemContent, "DirElemContent"), root_2);
 
-                // xquery/XQueryParser.g:1112:98: ( pm_DirElemContent )*
+                // xquery/XQueryParser.g:1114:98: ( pm_DirElemContent )*
                 while ( stream_pm_DirElemContent.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pm_DirElemContent.nextTree());
 
@@ -37364,7 +37370,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1117:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
+    // xquery/XQueryParser.g:1119:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
     // $ANTLR start "p_DirAttributeList"
     p_DirAttributeList: function() {
         var retval = new XQueryParser.p_DirAttributeList_return();
@@ -37372,24 +37378,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+        var S362 = null;
         var S363 = null;
-        var S364 = null;
-        var EQUAL365 = null;
-        var S366 = null;
+        var EQUAL364 = null;
+        var S365 = null;
          var t = null;
          var v = null;
 
+        var S362_tree=null;
         var S363_tree=null;
-        var S364_tree=null;
-        var EQUAL365_tree=null;
-        var S366_tree=null;
+        var EQUAL364_tree=null;
+        var S365_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1118:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             loop147:
             do {
                 var alt147=2;
@@ -37402,13 +37408,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt147) {
                 case 1 :
-                    // xquery/XQueryParser.g:1118:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
-                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8309); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1120:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    S362=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8313); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    S363_tree = this.adaptor.create(S363);
-                    this.adaptor.addChild(root_0, S363_tree);
+                    S362_tree = this.adaptor.create(S362);
+                    this.adaptor.addChild(root_0, S362_tree);
                     }
-                    // xquery/XQueryParser.g:1118:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    // xquery/XQueryParser.g:1120:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
                     var alt146=2;
                     var LA146_0 = this.input.LA(1);
 
@@ -37417,8 +37423,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt146) {
                         case 1 :
-                            // xquery/XQueryParser.g:1118:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
-                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8314);
+                            // xquery/XQueryParser.g:1120:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
+                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8318);
                             t=this.p_QName();
 
                             this.state._fsp--;
@@ -37427,7 +37433,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if ( this.state.backtracking===0 ) {
                               this.at((t?t.start:null), (t?t.stop:null));
                             }
-                            // xquery/XQueryParser.g:1118:55: ( S )?
+                            // xquery/XQueryParser.g:1120:55: ( S )?
                             var alt144=2;
                             var LA144_0 = this.input.LA(1);
 
@@ -37436,11 +37442,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt144) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:55: S
-                                    S364=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8318); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:55: S
+                                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8322); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S364_tree = this.adaptor.create(S364);
-                                    this.adaptor.addChild(root_0, S364_tree);
+                                    S363_tree = this.adaptor.create(S363);
+                                    this.adaptor.addChild(root_0, S363_tree);
                                     }
 
 
@@ -37448,12 +37454,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            EQUAL365=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8321); if (this.state.failed) return retval;
+                            EQUAL364=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8325); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            EQUAL365_tree = this.adaptor.create(EQUAL365);
-                            this.adaptor.addChild(root_0, EQUAL365_tree);
+                            EQUAL364_tree = this.adaptor.create(EQUAL364);
+                            this.adaptor.addChild(root_0, EQUAL364_tree);
                             }
-                            // xquery/XQueryParser.g:1118:64: ( S )?
+                            // xquery/XQueryParser.g:1120:64: ( S )?
                             var alt145=2;
                             var LA145_0 = this.input.LA(1);
 
@@ -37462,11 +37468,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt145) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:64: S
-                                    S366=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8323); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:64: S
+                                    S365=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8327); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S366_tree = this.adaptor.create(S366);
-                                    this.adaptor.addChild(root_0, S366_tree);
+                                    S365_tree = this.adaptor.create(S365);
+                                    this.adaptor.addChild(root_0, S365_tree);
                                     }
 
 
@@ -37474,7 +37480,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328);
+                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332);
                             v=this.p_DirAttributeValue();
 
                             this.state._fsp--;
@@ -37531,7 +37537,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1122:1: p_DirAttributeValue : ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
+    // xquery/XQueryParser.g:1124:1: p_DirAttributeValue : ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
     // $ANTLR start "p_DirAttributeValue"
     p_DirAttributeValue: function() {
         var retval = new XQueryParser.p_DirAttributeValue_return();
@@ -37539,25 +37545,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT367 = null;
-        var ESCAPE_QUOT368 = null;
-        var APOS369 = null;
-        var QUOT371 = null;
-        var APOS372 = null;
-        var ESCAPE_APOS373 = null;
-        var QUOT374 = null;
-        var APOS376 = null;
-         var p_QuotAttrValueContent370 = null;
-         var p_AposAttrValueContent375 = null;
+        var s = null;
+        var list_s=null;
+         var p_QuotAttrValueContent366 = null;
+         var p_AposAttrValueContent367 = null;
 
-        var QUOT367_tree=null;
-        var ESCAPE_QUOT368_tree=null;
-        var APOS369_tree=null;
-        var QUOT371_tree=null;
-        var APOS372_tree=null;
-        var ESCAPE_APOS373_tree=null;
-        var QUOT374_tree=null;
-        var APOS376_tree=null;
+        var s_tree=null;
         var stream_ESCAPE_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_QUOT");
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_ESCAPE_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_APOS");
@@ -37565,7 +37558,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_QuotAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QuotAttrValueContent");
         var stream_p_AposAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_AposAttrValueContent");
         try {
-            // xquery/XQueryParser.g:1123:9: ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
+            // xquery/XQueryParser.g:1125:9: ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
             var alt150=2;
             var LA150_0 = this.input.LA(1);
 
@@ -37584,13 +37577,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt150) {
                 case 1 :
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:12: QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT
-                    QUOT367=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8360); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT367);
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:12: s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8366); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
 
-                    // xquery/XQueryParser.g:1123:17: ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                      this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1125:45: (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )*
                     loop148:
                     do {
                         var alt148=4;
@@ -37614,29 +37613,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt148) {
                         case 1 :
-                            // xquery/XQueryParser.g:1123:18: ESCAPE_QUOT
-                            ESCAPE_QUOT368=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(ESCAPE_QUOT368);
+                            // xquery/XQueryParser.g:1125:46: s+= ESCAPE_QUOT
+                            s=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1123:32: APOS
-                            APOS369=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8367); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_APOS.add(APOS369);
+                            // xquery/XQueryParser.g:1125:63: s+= APOS
+                            s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8379); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1123:39: p_QuotAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371);
-                            p_QuotAttrValueContent370=this.p_QuotAttrValueContent();
+                            // xquery/XQueryParser.g:1125:73: p_QuotAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383);
+                            p_QuotAttrValueContent366=this.p_QuotAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent370.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent366.getTree());
 
 
                             break;
@@ -37646,12 +37651,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    QUOT371=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8375); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT371);
-
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8389); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -37665,14 +37679,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1124:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                    // 1126:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1124:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1124:40: ( p_QuotAttrValueContent )*
+                        // xquery/XQueryParser.g:1126:40: ( p_QuotAttrValueContent )*
                         while ( stream_p_QuotAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_QuotAttrValueContent.nextTree());
 
@@ -37688,13 +37702,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:12: APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS
-                    APOS372=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8414); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS372);
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:12: s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8434); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
 
-                    // xquery/XQueryParser.g:1125:17: ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1127:46: (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )*
                     loop149:
                     do {
                         var alt149=4;
@@ -37718,29 +37738,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt149) {
                         case 1 :
-                            // xquery/XQueryParser.g:1125:18: ESCAPE_APOS
-                            ESCAPE_APOS373=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(ESCAPE_APOS373);
+                            // xquery/XQueryParser.g:1127:47: s+= ESCAPE_APOS
+                            s=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1125:32: QUOT
-                            QUOT374=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8421); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT374);
+                            // xquery/XQueryParser.g:1127:64: s+= QUOT
+                            s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8447); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1125:39: p_AposAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425);
-                            p_AposAttrValueContent375=this.p_AposAttrValueContent();
+                            // xquery/XQueryParser.g:1127:74: p_AposAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451);
+                            p_AposAttrValueContent367=this.p_AposAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent375.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent367.getTree());
 
 
                             break;
@@ -37750,12 +37776,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    APOS376=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8429); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS376);
-
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8457); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -37769,14 +37804,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1126:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                    // 1128:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                        // xquery/XQueryParser.g:1128:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1126:40: ( p_AposAttrValueContent )*
+                        // xquery/XQueryParser.g:1128:40: ( p_AposAttrValueContent )*
                         while ( stream_p_AposAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_AposAttrValueContent.nextTree());
 
@@ -37826,7 +37861,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1130:1: p_QuotAttrValueContent : ( p_QuotAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1132:1: p_QuotAttrValueContent : (s= p_QuotAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_QuotAttrValueContent"
     p_QuotAttrValueContent: function() {
         var retval = new XQueryParser.p_QuotAttrValueContent_return();
@@ -37834,12 +37869,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuotAttrContentChar377 = null;
-         var pm_CommonContent378 = null;
+         var s = null;
+         var pm_CommonContent368 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1131:9: ( p_QuotAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1133:9: (s= p_QuotAttrContentChar | pm_CommonContent )
             var alt151=2;
             var LA151_0 = this.input.LA(1);
 
@@ -37858,28 +37893,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt151) {
                 case 1 :
-                    // xquery/XQueryParser.g:1131:11: p_QuotAttrContentChar
+                    // xquery/XQueryParser.g:1133:11: s= p_QuotAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481);
-                    p_QuotAttrContentChar377=this.p_QuotAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515);
+                    s=this.p_QuotAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuotAttrContentChar377.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1131:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1133:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485);
-                    pm_CommonContent378=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521);
+                    pm_CommonContent368=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent378.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent368.getTree());
 
 
                     break;
@@ -37918,7 +37956,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1135:1: p_AposAttrValueContent : ( p_AposAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1137:1: p_AposAttrValueContent : (s= p_AposAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_AposAttrValueContent"
     p_AposAttrValueContent: function() {
         var retval = new XQueryParser.p_AposAttrValueContent_return();
@@ -37926,12 +37964,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AposAttrContentChar379 = null;
-         var pm_CommonContent380 = null;
+         var s = null;
+         var pm_CommonContent369 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1136:9: ( p_AposAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1138:9: (s= p_AposAttrContentChar | pm_CommonContent )
             var alt152=2;
             var LA152_0 = this.input.LA(1);
 
@@ -37950,28 +37988,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt152) {
                 case 1 :
-                    // xquery/XQueryParser.g:1136:11: p_AposAttrContentChar
+                    // xquery/XQueryParser.g:1138:11: s= p_AposAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511);
-                    p_AposAttrContentChar379=this.p_AposAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549);
+                    s=this.p_AposAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AposAttrContentChar379.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1136:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1138:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515);
-                    pm_CommonContent380=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555);
+                    pm_CommonContent369=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent380.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent369.getTree());
 
 
                     break;
@@ -38010,7 +38051,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1140:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
+    // xquery/XQueryParser.g:1142:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
     // $ANTLR start "pm_DirElemContent"
     pm_DirElemContent: function() {
         var retval = new XQueryParser.pm_DirElemContent_return();
@@ -38018,14 +38059,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor381 = null;
-         var p_CDataSection382 = null;
-         var pm_CommonContent383 = null;
-         var p_ElementContentChar384 = null;
+         var p_DirectConstructor370 = null;
+         var p_CDataSection371 = null;
+         var pm_CommonContent372 = null;
+         var p_ElementContentChar373 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1141:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
+            // xquery/XQueryParser.g:1143:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
             var alt153=4;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -38056,54 +38097,54 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt153) {
                 case 1 :
-                    // xquery/XQueryParser.g:1141:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1143:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541);
-                    p_DirectConstructor381=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581);
+                    p_DirectConstructor370=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor381.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor370.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1142:11: p_CDataSection
+                    // xquery/XQueryParser.g:1144:11: p_CDataSection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8553);
-                    p_CDataSection382=this.p_CDataSection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8593);
+                    p_CDataSection371=this.p_CDataSection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection382.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection371.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1143:11: pm_CommonContent
+                    // xquery/XQueryParser.g:1145:11: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8565);
-                    pm_CommonContent383=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8605);
+                    pm_CommonContent372=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent383.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent372.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1144:11: p_ElementContentChar
+                    // xquery/XQueryParser.g:1146:11: p_ElementContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577);
-                    p_ElementContentChar384=this.p_ElementContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617);
+                    p_ElementContentChar373=this.p_ElementContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar384.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar373.getTree());
 
 
                     break;
@@ -38142,7 +38183,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1150:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml );
+    // xquery/XQueryParser.g:1152:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml );
     // $ANTLR start "pm_CommonContent"
     pm_CommonContent: function() {
         var retval = new XQueryParser.pm_CommonContent_return();
@@ -38150,19 +38191,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_PredefinedEntityRef385 = null;
-        var L_CharRef386 = null;
-        var ESCAPE_LBRACKET387 = null;
-        var ESCAPE_RBRACKET388 = null;
-         var pg_EnclosedExprXml389 = null;
+        var s = null;
+        var L_PredefinedEntityRef374 = null;
+        var L_CharRef375 = null;
+         var pg_EnclosedExprXml376 = null;
 
-        var L_PredefinedEntityRef385_tree=null;
-        var L_CharRef386_tree=null;
-        var ESCAPE_LBRACKET387_tree=null;
-        var ESCAPE_RBRACKET388_tree=null;
+        var s_tree=null;
+        var L_PredefinedEntityRef374_tree=null;
+        var L_CharRef375_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1151:9: ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml )
+            // xquery/XQueryParser.g:1153:9: ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml )
             var alt154=5;
             switch ( this.input.LA(1) ) {
             case L_PredefinedEntityRef:
@@ -38190,63 +38229,69 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt154) {
                 case 1 :
-                    // xquery/XQueryParser.g:1151:11: L_PredefinedEntityRef
+                    // xquery/XQueryParser.g:1153:11: L_PredefinedEntityRef
                     root_0 = this.adaptor.nil();
 
-                    L_PredefinedEntityRef385=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605); if (this.state.failed) return retval;
+                    L_PredefinedEntityRef374=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_PredefinedEntityRef385_tree = this.adaptor.create(L_PredefinedEntityRef385);
-                    this.adaptor.addChild(root_0, L_PredefinedEntityRef385_tree);
+                    L_PredefinedEntityRef374_tree = this.adaptor.create(L_PredefinedEntityRef374);
+                    this.adaptor.addChild(root_0, L_PredefinedEntityRef374_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1152:11: L_CharRef
+                    // xquery/XQueryParser.g:1154:11: L_CharRef
                     root_0 = this.adaptor.nil();
 
-                    L_CharRef386=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8617); if (this.state.failed) return retval;
+                    L_CharRef375=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8657); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_CharRef386_tree = this.adaptor.create(L_CharRef386);
-                    this.adaptor.addChild(root_0, L_CharRef386_tree);
+                    L_CharRef375_tree = this.adaptor.create(L_CharRef375);
+                    this.adaptor.addChild(root_0, L_CharRef375_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1153:11: ESCAPE_LBRACKET
+                    // xquery/XQueryParser.g:1155:11: s= ESCAPE_LBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_LBRACKET387=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_LBRACKET387_tree = this.adaptor.create(ESCAPE_LBRACKET387);
-                    this.adaptor.addChild(root_0, ESCAPE_LBRACKET387_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1154:11: ESCAPE_RBRACKET
+                    // xquery/XQueryParser.g:1156:11: s= ESCAPE_RBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_RBRACKET388=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_RBRACKET388_tree = this.adaptor.create(ESCAPE_RBRACKET388);
-                    this.adaptor.addChild(root_0, ESCAPE_RBRACKET388_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1155:11: pg_EnclosedExprXml
+                    // xquery/XQueryParser.g:1157:11: pg_EnclosedExprXml
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653);
-                    pg_EnclosedExprXml389=this.pg_EnclosedExprXml();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701);
+                    pg_EnclosedExprXml376=this.pg_EnclosedExprXml();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml389.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml376.getTree());
 
 
                     break;
@@ -38285,7 +38330,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1163:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1165:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pg_EnclosedExprXml"
     pg_EnclosedExprXml: function() {
         var retval = new XQueryParser.pg_EnclosedExprXml_return();
@@ -38293,36 +38338,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET390 = null;
-        var RBRACKET392 = null;
-         var p_StatementsAndOptionalExpr391 = null;
+        var LBRACKET377 = null;
+        var RBRACKET379 = null;
+         var p_StatementsAndOptionalExpr378 = null;
 
-        var LBRACKET390_tree=null;
-        var RBRACKET392_tree=null;
+        var LBRACKET377_tree=null;
+        var RBRACKET379_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1164:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1164:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1166:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1166:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET390=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685); if (this.state.failed) return retval;
+            LBRACKET377=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET390_tree = this.adaptor.create(LBRACKET390);
-            this.adaptor.addChild(root_0, LBRACKET390_tree);
+            LBRACKET377_tree = this.adaptor.create(LBRACKET377);
+            this.adaptor.addChild(root_0, LBRACKET377_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.pushXQueryLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701);
-            p_StatementsAndOptionalExpr391=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749);
+            p_StatementsAndOptionalExpr378=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr391.getTree());
-            RBRACKET392=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr378.getTree());
+            RBRACKET379=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET392_tree = this.adaptor.create(RBRACKET392);
-            this.adaptor.addChild(root_0, RBRACKET392_tree);
+            RBRACKET379_tree = this.adaptor.create(RBRACKET379);
+            this.adaptor.addChild(root_0, RBRACKET379_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.popLexer();
@@ -38363,7 +38408,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1171:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
+    // xquery/XQueryParser.g:1173:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
     // $ANTLR start "p_DirCommentConstructor"
     p_DirCommentConstructor: function() {
         var retval = new XQueryParser.p_DirCommentConstructor_return();
@@ -38376,11 +38421,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var c_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1172:9: (c= L_DirCommentConstructor )
-            // xquery/XQueryParser.g:1172:11: c= L_DirCommentConstructor
+            // xquery/XQueryParser.g:1174:9: (c= L_DirCommentConstructor )
+            // xquery/XQueryParser.g:1174:11: c= L_DirCommentConstructor
             root_0 = this.adaptor.nil();
 
-            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746); if (this.state.failed) return retval;
+            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             c_tree = this.adaptor.create(c);
             this.adaptor.addChild(root_0, c_tree);
@@ -38424,7 +38469,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1179:1: p_DirPIConstructor : p= L_DirPIConstructor ;
+    // xquery/XQueryParser.g:1181:1: p_DirPIConstructor : p= L_DirPIConstructor ;
     // $ANTLR start "p_DirPIConstructor"
     p_DirPIConstructor: function() {
         var retval = new XQueryParser.p_DirPIConstructor_return();
@@ -38437,11 +38482,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var p_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1180:9: (p= L_DirPIConstructor )
-            // xquery/XQueryParser.g:1180:11: p= L_DirPIConstructor
+            // xquery/XQueryParser.g:1182:9: (p= L_DirPIConstructor )
+            // xquery/XQueryParser.g:1182:11: p= L_DirPIConstructor
             root_0 = this.adaptor.nil();
 
-            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782); if (this.state.failed) return retval;
+            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             p_tree = this.adaptor.create(p);
             this.adaptor.addChild(root_0, p_tree);
@@ -38485,7 +38530,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1187:1: p_CDataSection : L_CDataSection ;
+    // xquery/XQueryParser.g:1189:1: p_CDataSection : L_CDataSection ;
     // $ANTLR start "p_CDataSection"
     p_CDataSection: function() {
         var retval = new XQueryParser.p_CDataSection_return();
@@ -38493,19 +38538,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_CDataSection393 = null;
+        var L_CDataSection380 = null;
 
-        var L_CDataSection393_tree=null;
+        var L_CDataSection380_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1188:9: ( L_CDataSection )
-            // xquery/XQueryParser.g:1188:11: L_CDataSection
+            // xquery/XQueryParser.g:1190:9: ( L_CDataSection )
+            // xquery/XQueryParser.g:1190:11: L_CDataSection
             root_0 = this.adaptor.nil();
 
-            L_CDataSection393=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8817); if (this.state.failed) return retval;
+            L_CDataSection380=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_CDataSection393_tree = this.adaptor.create(L_CDataSection393);
-            this.adaptor.addChild(root_0, L_CDataSection393_tree);
+            L_CDataSection380_tree = this.adaptor.create(L_CDataSection380);
+            this.adaptor.addChild(root_0, L_CDataSection380_tree);
             }
 
 
@@ -38543,7 +38588,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1195:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
+    // xquery/XQueryParser.g:1197:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
     // $ANTLR start "p_ComputedConstructor"
     p_ComputedConstructor: function() {
         var retval = new XQueryParser.p_ComputedConstructor_return();
@@ -38551,18 +38596,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pm_CompDocConstructor394 = null;
-         var pm_CompElemConstructor395 = null;
-         var pm_CompAttrConstructor396 = null;
-         var p_CompNamespaceConstructor397 = null;
-         var p_CompTextConstructor398 = null;
-         var pm_CompCommentConstructor399 = null;
-         var pm_CompPIConstructor400 = null;
-         var p_CompBinaryConstructor401 = null;
+         var pm_CompDocConstructor381 = null;
+         var pm_CompElemConstructor382 = null;
+         var pm_CompAttrConstructor383 = null;
+         var p_CompNamespaceConstructor384 = null;
+         var p_CompTextConstructor385 = null;
+         var pm_CompCommentConstructor386 = null;
+         var pm_CompPIConstructor387 = null;
+         var p_CompBinaryConstructor388 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1196:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
+            // xquery/XQueryParser.g:1198:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
             var alt155=8;
             var LA155_0 = this.input.LA(1);
 
@@ -38599,110 +38644,110 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt155) {
                 case 1 :
-                    // xquery/XQueryParser.g:1196:11: pm_CompDocConstructor
+                    // xquery/XQueryParser.g:1198:11: pm_CompDocConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849);
-                    pm_CompDocConstructor394=this.pm_CompDocConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897);
+                    pm_CompDocConstructor381=this.pm_CompDocConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor394.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor381.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1197:11: pm_CompElemConstructor
+                    // xquery/XQueryParser.g:1199:11: pm_CompElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861);
-                    pm_CompElemConstructor395=this.pm_CompElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909);
+                    pm_CompElemConstructor382=this.pm_CompElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor395.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor382.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1198:11: pm_CompAttrConstructor
+                    // xquery/XQueryParser.g:1200:11: pm_CompAttrConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873);
-                    pm_CompAttrConstructor396=this.pm_CompAttrConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921);
+                    pm_CompAttrConstructor383=this.pm_CompAttrConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor396.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor383.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1199:11: p_CompNamespaceConstructor
+                    // xquery/XQueryParser.g:1201:11: p_CompNamespaceConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885);
-                    p_CompNamespaceConstructor397=this.p_CompNamespaceConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933);
+                    p_CompNamespaceConstructor384=this.p_CompNamespaceConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor397.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor384.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1200:11: p_CompTextConstructor
+                    // xquery/XQueryParser.g:1202:11: p_CompTextConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897);
-                    p_CompTextConstructor398=this.p_CompTextConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945);
+                    p_CompTextConstructor385=this.p_CompTextConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor398.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor385.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1201:11: pm_CompCommentConstructor
+                    // xquery/XQueryParser.g:1203:11: pm_CompCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909);
-                    pm_CompCommentConstructor399=this.pm_CompCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957);
+                    pm_CompCommentConstructor386=this.pm_CompCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor399.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor386.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1202:11: pm_CompPIConstructor
+                    // xquery/XQueryParser.g:1204:11: pm_CompPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921);
-                    pm_CompPIConstructor400=this.pm_CompPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969);
+                    pm_CompPIConstructor387=this.pm_CompPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor400.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor387.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1203:11: {...}? => p_CompBinaryConstructor
+                    // xquery/XQueryParser.g:1205:11: {...}? => p_CompBinaryConstructor
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ComputedConstructor", "this.lc(MLS)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936);
-                    p_CompBinaryConstructor401=this.p_CompBinaryConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984);
+                    p_CompBinaryConstructor388=this.p_CompBinaryConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor401.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor388.getTree());
 
 
                     break;
@@ -38741,7 +38786,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1208:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1210:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompDocConstructor"
     pm_CompDocConstructor: function() {
         var retval = new XQueryParser.pm_CompDocConstructor_return();
@@ -38750,20 +38795,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET402 = null;
-        var RBRACKET404 = null;
-         var p_StatementsAndOptionalExpr403 = null;
+        var LBRACKET389 = null;
+        var RBRACKET391 = null;
+         var p_StatementsAndOptionalExpr390 = null;
 
         var k_tree=null;
-        var LBRACKET402_tree=null;
-        var RBRACKET404_tree=null;
+        var LBRACKET389_tree=null;
+        var RBRACKET391_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1209:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1209:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1211:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1211:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965); if (this.state.failed) return retval;
+            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -38771,21 +38816,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET402=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor8969); if (this.state.failed) return retval;
+            LBRACKET389=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor9017); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET402_tree = this.adaptor.create(LBRACKET402);
-            this.adaptor.addChild(root_0, LBRACKET402_tree);
+            LBRACKET389_tree = this.adaptor.create(LBRACKET389);
+            this.adaptor.addChild(root_0, LBRACKET389_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971);
-            p_StatementsAndOptionalExpr403=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019);
+            p_StatementsAndOptionalExpr390=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr403.getTree());
-            RBRACKET404=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor8973); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr390.getTree());
+            RBRACKET391=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor9021); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET404_tree = this.adaptor.create(RBRACKET404);
-            this.adaptor.addChild(root_0, RBRACKET404_tree);
+            RBRACKET391_tree = this.adaptor.create(RBRACKET391);
+            this.adaptor.addChild(root_0, RBRACKET391_tree);
             }
 
 
@@ -38823,7 +38868,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1213:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
+    // xquery/XQueryParser.g:1215:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
     // $ANTLR start "pm_CompElemConstructor"
     pm_CompElemConstructor: function() {
         var retval = new XQueryParser.pm_CompElemConstructor_return();
@@ -38832,26 +38877,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET406 = null;
-        var RBRACKET408 = null;
-        var LBRACKET409 = null;
-        var RBRACKET411 = null;
-         var p_QName405 = null;
-         var p_Expr407 = null;
-         var pm_ContentExpr410 = null;
+        var LBRACKET393 = null;
+        var RBRACKET395 = null;
+        var LBRACKET396 = null;
+        var RBRACKET398 = null;
+         var p_QName392 = null;
+         var p_Expr394 = null;
+         var pm_ContentExpr397 = null;
 
         var k_tree=null;
-        var LBRACKET406_tree=null;
-        var RBRACKET408_tree=null;
-        var LBRACKET409_tree=null;
-        var RBRACKET411_tree=null;
+        var LBRACKET393_tree=null;
+        var RBRACKET395_tree=null;
+        var LBRACKET396_tree=null;
+        var RBRACKET398_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1214:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
-            // xquery/XQueryParser.g:1214:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
+            // xquery/XQueryParser.g:1216:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
+            // xquery/XQueryParser.g:1216:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9009); if (this.state.failed) return retval;
+            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9057); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -38859,7 +38904,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1214:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1216:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt156=2;
             var LA156_0 = this.input.LA(1);
 
@@ -38878,35 +38923,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt156) {
                 case 1 :
-                    // xquery/XQueryParser.g:1214:37: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9014);
-                    p_QName405=this.p_QName();
+                    // xquery/XQueryParser.g:1216:37: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9062);
+                    p_QName392=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName405.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName392.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:48: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET406=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9019); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:48: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET393=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9067); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET406_tree = this.adaptor.create(LBRACKET406);
-                    this.adaptor.addChild(root_0, LBRACKET406_tree);
+                    LBRACKET393_tree = this.adaptor.create(LBRACKET393);
+                    this.adaptor.addChild(root_0, LBRACKET393_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9021);
-                    p_Expr407=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9069);
+                    p_Expr394=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr407.getTree());
-                    RBRACKET408=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9024); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr394.getTree());
+                    RBRACKET395=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET408_tree = this.adaptor.create(RBRACKET408);
-                    this.adaptor.addChild(root_0, RBRACKET408_tree);
+                    RBRACKET395_tree = this.adaptor.create(RBRACKET395);
+                    this.adaptor.addChild(root_0, RBRACKET395_tree);
                     }
 
 
@@ -38917,21 +38962,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET409=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9028); if (this.state.failed) return retval;
+            LBRACKET396=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9076); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET409_tree = this.adaptor.create(LBRACKET409);
-            this.adaptor.addChild(root_0, LBRACKET409_tree);
+            LBRACKET396_tree = this.adaptor.create(LBRACKET396);
+            this.adaptor.addChild(root_0, LBRACKET396_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030);
-            pm_ContentExpr410=this.pm_ContentExpr();
+            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078);
+            pm_ContentExpr397=this.pm_ContentExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr410.getTree());
-            RBRACKET411=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9032); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr397.getTree());
+            RBRACKET398=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9080); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET411_tree = this.adaptor.create(RBRACKET411);
-            this.adaptor.addChild(root_0, RBRACKET411_tree);
+            RBRACKET398_tree = this.adaptor.create(RBRACKET398);
+            this.adaptor.addChild(root_0, RBRACKET398_tree);
             }
 
 
@@ -38969,7 +39014,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1219:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1221:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
     // $ANTLR start "pm_ContentExpr"
     pm_ContentExpr: function() {
         var retval = new XQueryParser.pm_ContentExpr_return();
@@ -38977,20 +39022,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr412 = null;
+         var p_StatementsAndOptionalExpr399 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1220:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1220:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1222:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1222:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059);
-            p_StatementsAndOptionalExpr412=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107);
+            p_StatementsAndOptionalExpr399=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr412.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr399.getTree());
 
 
 
@@ -39027,7 +39072,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1225:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1227:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompAttrConstructor"
     pm_CompAttrConstructor: function() {
         var retval = new XQueryParser.pm_CompAttrConstructor_return();
@@ -39036,26 +39081,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET414 = null;
-        var RBRACKET416 = null;
-        var LBRACKET417 = null;
-        var RBRACKET419 = null;
-         var p_QName413 = null;
-         var p_Expr415 = null;
-         var p_StatementsAndOptionalExpr418 = null;
+        var LBRACKET401 = null;
+        var RBRACKET403 = null;
+        var LBRACKET404 = null;
+        var RBRACKET406 = null;
+         var p_QName400 = null;
+         var p_Expr402 = null;
+         var p_StatementsAndOptionalExpr405 = null;
 
         var k_tree=null;
-        var LBRACKET414_tree=null;
-        var RBRACKET416_tree=null;
-        var LBRACKET417_tree=null;
-        var RBRACKET419_tree=null;
+        var LBRACKET401_tree=null;
+        var RBRACKET403_tree=null;
+        var LBRACKET404_tree=null;
+        var RBRACKET406_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1226:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1226:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1228:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1228:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088); if (this.state.failed) return retval;
+            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39063,7 +39108,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1226:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1228:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt157=2;
             var LA157_0 = this.input.LA(1);
 
@@ -39082,35 +39127,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt157) {
                 case 1 :
-                    // xquery/XQueryParser.g:1226:39: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9093);
-                    p_QName413=this.p_QName();
+                    // xquery/XQueryParser.g:1228:39: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9141);
+                    p_QName400=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName413.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName400.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:50: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET414=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:50: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET401=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET414_tree = this.adaptor.create(LBRACKET414);
-                    this.adaptor.addChild(root_0, LBRACKET414_tree);
+                    LBRACKET401_tree = this.adaptor.create(LBRACKET401);
+                    this.adaptor.addChild(root_0, LBRACKET401_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9100);
-                    p_Expr415=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9148);
+                    p_Expr402=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
-                    RBRACKET416=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr402.getTree());
+                    RBRACKET403=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET416_tree = this.adaptor.create(RBRACKET416);
-                    this.adaptor.addChild(root_0, RBRACKET416_tree);
+                    RBRACKET403_tree = this.adaptor.create(RBRACKET403);
+                    this.adaptor.addChild(root_0, RBRACKET403_tree);
                     }
 
 
@@ -39121,21 +39166,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107); if (this.state.failed) return retval;
+            LBRACKET404=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
-            this.adaptor.addChild(root_0, LBRACKET417_tree);
+            LBRACKET404_tree = this.adaptor.create(LBRACKET404);
+            this.adaptor.addChild(root_0, LBRACKET404_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109);
-            p_StatementsAndOptionalExpr418=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157);
+            p_StatementsAndOptionalExpr405=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr418.getTree());
-            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr405.getTree());
+            RBRACKET406=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
-            this.adaptor.addChild(root_0, RBRACKET419_tree);
+            RBRACKET406_tree = this.adaptor.create(RBRACKET406);
+            this.adaptor.addChild(root_0, RBRACKET406_tree);
             }
 
 
@@ -39173,7 +39218,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1230:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
+    // xquery/XQueryParser.g:1232:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
     // $ANTLR start "p_CompNamespaceConstructor"
     p_CompNamespaceConstructor: function() {
         var retval = new XQueryParser.p_CompNamespaceConstructor_return();
@@ -39182,26 +39227,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET421 = null;
-        var RBRACKET423 = null;
-        var LBRACKET424 = null;
-        var RBRACKET426 = null;
-         var p_Prefix420 = null;
-         var p_PrefixExpr422 = null;
-         var p_URIExpr425 = null;
+        var LBRACKET408 = null;
+        var RBRACKET410 = null;
+        var LBRACKET411 = null;
+        var RBRACKET413 = null;
+         var p_Prefix407 = null;
+         var p_PrefixExpr409 = null;
+         var p_URIExpr412 = null;
 
         var k_tree=null;
-        var LBRACKET421_tree=null;
-        var RBRACKET423_tree=null;
-        var LBRACKET424_tree=null;
-        var RBRACKET426_tree=null;
+        var LBRACKET408_tree=null;
+        var RBRACKET410_tree=null;
+        var LBRACKET411_tree=null;
+        var RBRACKET413_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1231:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
-            // xquery/XQueryParser.g:1231:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
+            // xquery/XQueryParser.g:1233:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
+            // xquery/XQueryParser.g:1233:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139); if (this.state.failed) return retval;
+            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39209,7 +39254,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1231:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
+            // xquery/XQueryParser.g:1233:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
             var alt158=2;
             var LA158_0 = this.input.LA(1);
 
@@ -39228,35 +39273,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt158) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:39: p_Prefix
-                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144);
-                    p_Prefix420=this.p_Prefix();
+                    // xquery/XQueryParser.g:1233:39: p_Prefix
+                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192);
+                    p_Prefix407=this.p_Prefix();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix420.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix407.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:51: LBRACKET p_PrefixExpr RBRACKET
-                    LBRACKET421=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:51: LBRACKET p_PrefixExpr RBRACKET
+                    LBRACKET408=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET421_tree = this.adaptor.create(LBRACKET421);
-                    this.adaptor.addChild(root_0, LBRACKET421_tree);
+                    LBRACKET408_tree = this.adaptor.create(LBRACKET408);
+                    this.adaptor.addChild(root_0, LBRACKET408_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151);
-                    p_PrefixExpr422=this.p_PrefixExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199);
+                    p_PrefixExpr409=this.p_PrefixExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr422.getTree());
-                    RBRACKET423=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr409.getTree());
+                    RBRACKET410=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET423_tree = this.adaptor.create(RBRACKET423);
-                    this.adaptor.addChild(root_0, RBRACKET423_tree);
+                    RBRACKET410_tree = this.adaptor.create(RBRACKET410);
+                    this.adaptor.addChild(root_0, RBRACKET410_tree);
                     }
 
 
@@ -39267,12 +39312,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET424=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157); if (this.state.failed) return retval;
+            LBRACKET411=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET424_tree = this.adaptor.create(LBRACKET424);
-            this.adaptor.addChild(root_0, LBRACKET424_tree);
+            LBRACKET411_tree = this.adaptor.create(LBRACKET411);
+            this.adaptor.addChild(root_0, LBRACKET411_tree);
             }
-            // xquery/XQueryParser.g:1231:93: ( p_URIExpr )?
+            // xquery/XQueryParser.g:1233:93: ( p_URIExpr )?
             var alt159=2;
             var LA159_0 = this.input.LA(1);
 
@@ -39281,23 +39326,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt159) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:93: p_URIExpr
-                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159);
-                    p_URIExpr425=this.p_URIExpr();
+                    // xquery/XQueryParser.g:1233:93: p_URIExpr
+                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207);
+                    p_URIExpr412=this.p_URIExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr425.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr412.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET426=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162); if (this.state.failed) return retval;
+            RBRACKET413=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET426_tree = this.adaptor.create(RBRACKET426);
-            this.adaptor.addChild(root_0, RBRACKET426_tree);
+            RBRACKET413_tree = this.adaptor.create(RBRACKET413);
+            this.adaptor.addChild(root_0, RBRACKET413_tree);
             }
 
 
@@ -39335,7 +39380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1235:1: p_Prefix : p_NCName ;
+    // xquery/XQueryParser.g:1237:1: p_Prefix : p_NCName ;
     // $ANTLR start "p_Prefix"
     p_Prefix: function() {
         var retval = new XQueryParser.p_Prefix_return();
@@ -39343,20 +39388,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NCName427 = null;
+         var p_NCName414 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1236:9: ( p_NCName )
-            // xquery/XQueryParser.g:1236:11: p_NCName
+            // xquery/XQueryParser.g:1238:9: ( p_NCName )
+            // xquery/XQueryParser.g:1238:11: p_NCName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9188);
-            p_NCName427=this.p_NCName();
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9236);
+            p_NCName414=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName427.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName414.getTree());
 
 
 
@@ -39393,7 +39438,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1240:1: p_PrefixExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1242:1: p_PrefixExpr : p_Expr[true,true] ;
     // $ANTLR start "p_PrefixExpr"
     p_PrefixExpr: function() {
         var retval = new XQueryParser.p_PrefixExpr_return();
@@ -39401,20 +39446,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr428 = null;
+         var p_Expr415 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1241:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1241:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1243:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1243:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9214);
-            p_Expr428=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9262);
+            p_Expr415=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
 
 
 
@@ -39451,7 +39496,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1245:1: p_URIExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1247:1: p_URIExpr : p_Expr[true,true] ;
     // $ANTLR start "p_URIExpr"
     p_URIExpr: function() {
         var retval = new XQueryParser.p_URIExpr_return();
@@ -39459,20 +39504,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr429 = null;
+         var p_Expr416 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1246:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1246:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1248:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1248:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9241);
-            p_Expr429=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9289);
+            p_Expr416=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr429.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr416.getTree());
 
 
 
@@ -39509,7 +39554,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1250:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1252:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompTextConstructor"
     p_CompTextConstructor: function() {
         var retval = new XQueryParser.p_CompTextConstructor_return();
@@ -39518,20 +39563,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET430 = null;
-        var RBRACKET432 = null;
-         var p_Expr431 = null;
+        var LBRACKET417 = null;
+        var RBRACKET419 = null;
+         var p_Expr418 = null;
 
         var k_tree=null;
-        var LBRACKET430_tree=null;
-        var RBRACKET432_tree=null;
+        var LBRACKET417_tree=null;
+        var RBRACKET419_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1251:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1251:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1253:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1253:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9270); if (this.state.failed) return retval;
+            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9318); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39539,21 +39584,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9274); if (this.state.failed) return retval;
+            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9322); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
-            this.adaptor.addChild(root_0, LBRACKET430_tree);
+            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
+            this.adaptor.addChild(root_0, LBRACKET417_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9276);
-            p_Expr431=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9324);
+            p_Expr418=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr431.getTree());
-            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9279); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr418.getTree());
+            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
-            this.adaptor.addChild(root_0, RBRACKET432_tree);
+            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
+            this.adaptor.addChild(root_0, RBRACKET419_tree);
             }
 
 
@@ -39591,7 +39636,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1255:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1257:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompBinaryConstructor"
     p_CompBinaryConstructor: function() {
         var retval = new XQueryParser.p_CompBinaryConstructor_return();
@@ -39600,20 +39645,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET433 = null;
-        var RBRACKET435 = null;
-         var p_Expr434 = null;
+        var LBRACKET420 = null;
+        var RBRACKET422 = null;
+         var p_Expr421 = null;
 
         var k_tree=null;
-        var LBRACKET433_tree=null;
-        var RBRACKET435_tree=null;
+        var LBRACKET420_tree=null;
+        var RBRACKET422_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1256:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1256:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1258:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1258:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9307); if (this.state.failed) return retval;
+            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9355); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39621,21 +39666,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET433=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311); if (this.state.failed) return retval;
+            LBRACKET420=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET433_tree = this.adaptor.create(LBRACKET433);
-            this.adaptor.addChild(root_0, LBRACKET433_tree);
+            LBRACKET420_tree = this.adaptor.create(LBRACKET420);
+            this.adaptor.addChild(root_0, LBRACKET420_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9313);
-            p_Expr434=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9361);
+            p_Expr421=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr434.getTree());
-            RBRACKET435=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr421.getTree());
+            RBRACKET422=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET435_tree = this.adaptor.create(RBRACKET435);
-            this.adaptor.addChild(root_0, RBRACKET435_tree);
+            RBRACKET422_tree = this.adaptor.create(RBRACKET422);
+            this.adaptor.addChild(root_0, RBRACKET422_tree);
             }
 
 
@@ -39673,7 +39718,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1261:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1263:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompCommentConstructor"
     pm_CompCommentConstructor: function() {
         var retval = new XQueryParser.pm_CompCommentConstructor_return();
@@ -39682,20 +39727,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET436 = null;
-        var RBRACKET438 = null;
-         var p_StatementsAndOptionalExpr437 = null;
+        var LBRACKET423 = null;
+        var RBRACKET425 = null;
+         var p_StatementsAndOptionalExpr424 = null;
 
         var k_tree=null;
-        var LBRACKET436_tree=null;
-        var RBRACKET438_tree=null;
+        var LBRACKET423_tree=null;
+        var RBRACKET425_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1262:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1262:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1264:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1264:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9345); if (this.state.failed) return retval;
+            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39703,21 +39748,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET436=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349); if (this.state.failed) return retval;
+            LBRACKET423=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET436_tree = this.adaptor.create(LBRACKET436);
-            this.adaptor.addChild(root_0, LBRACKET436_tree);
+            LBRACKET423_tree = this.adaptor.create(LBRACKET423);
+            this.adaptor.addChild(root_0, LBRACKET423_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351);
-            p_StatementsAndOptionalExpr437=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399);
+            p_StatementsAndOptionalExpr424=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr437.getTree());
-            RBRACKET438=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr424.getTree());
+            RBRACKET425=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET438_tree = this.adaptor.create(RBRACKET438);
-            this.adaptor.addChild(root_0, RBRACKET438_tree);
+            RBRACKET425_tree = this.adaptor.create(RBRACKET425);
+            this.adaptor.addChild(root_0, RBRACKET425_tree);
             }
 
 
@@ -39755,7 +39800,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1267:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1269:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompPIConstructor"
     pm_CompPIConstructor: function() {
         var retval = new XQueryParser.pm_CompPIConstructor_return();
@@ -39764,26 +39809,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET440 = null;
-        var RBRACKET442 = null;
-        var LBRACKET443 = null;
-        var RBRACKET445 = null;
-         var p_NCName439 = null;
-         var p_Expr441 = null;
-         var p_StatementsAndOptionalExpr444 = null;
+        var LBRACKET427 = null;
+        var RBRACKET429 = null;
+        var LBRACKET430 = null;
+        var RBRACKET432 = null;
+         var p_NCName426 = null;
+         var p_Expr428 = null;
+         var p_StatementsAndOptionalExpr431 = null;
 
         var k_tree=null;
-        var LBRACKET440_tree=null;
-        var RBRACKET442_tree=null;
-        var LBRACKET443_tree=null;
-        var RBRACKET445_tree=null;
+        var LBRACKET427_tree=null;
+        var RBRACKET429_tree=null;
+        var LBRACKET430_tree=null;
+        var RBRACKET432_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1268:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1268:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1270:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1270:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382); if (this.state.failed) return retval;
+            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -39791,7 +39836,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1268:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1270:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt160=2;
             var LA160_0 = this.input.LA(1);
 
@@ -39810,35 +39855,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt160) {
                 case 1 :
-                    // xquery/XQueryParser.g:1268:52: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9387);
-                    p_NCName439=this.p_NCName();
+                    // xquery/XQueryParser.g:1270:52: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9435);
+                    p_NCName426=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName439.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName426.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:64: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET440=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9392); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:64: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET427=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9440); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET440_tree = this.adaptor.create(LBRACKET440);
-                    this.adaptor.addChild(root_0, LBRACKET440_tree);
+                    LBRACKET427_tree = this.adaptor.create(LBRACKET427);
+                    this.adaptor.addChild(root_0, LBRACKET427_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9394);
-                    p_Expr441=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9442);
+                    p_Expr428=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr441.getTree());
-                    RBRACKET442=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9397); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+                    RBRACKET429=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9445); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET442_tree = this.adaptor.create(RBRACKET442);
-                    this.adaptor.addChild(root_0, RBRACKET442_tree);
+                    RBRACKET429_tree = this.adaptor.create(RBRACKET429);
+                    this.adaptor.addChild(root_0, RBRACKET429_tree);
                     }
 
 
@@ -39849,21 +39894,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET443=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9401); if (this.state.failed) return retval;
+            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9449); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET443_tree = this.adaptor.create(LBRACKET443);
-            this.adaptor.addChild(root_0, LBRACKET443_tree);
+            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
+            this.adaptor.addChild(root_0, LBRACKET430_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403);
-            p_StatementsAndOptionalExpr444=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451);
+            p_StatementsAndOptionalExpr431=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr444.getTree());
-            RBRACKET445=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9405); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr431.getTree());
+            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9453); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET445_tree = this.adaptor.create(RBRACKET445);
-            this.adaptor.addChild(root_0, RBRACKET445_tree);
+            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
+            this.adaptor.addChild(root_0, RBRACKET432_tree);
             }
 
 
@@ -39901,7 +39946,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1290:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
+    // xquery/XQueryParser.g:1292:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
     // $ANTLR start "p_SingleType"
     p_SingleType: function() {
         var retval = new XQueryParser.p_SingleType_return();
@@ -39909,23 +39954,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION447 = null;
-         var p_AtomicOrUnionType446 = null;
+        var QUESTION434 = null;
+         var p_AtomicOrUnionType433 = null;
 
-        var QUESTION447_tree=null;
+        var QUESTION434_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1291:9: ( p_AtomicOrUnionType ( QUESTION )? )
-            // xquery/XQueryParser.g:1291:11: p_AtomicOrUnionType ( QUESTION )?
+            // xquery/XQueryParser.g:1293:9: ( p_AtomicOrUnionType ( QUESTION )? )
+            // xquery/XQueryParser.g:1293:11: p_AtomicOrUnionType ( QUESTION )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449);
-            p_AtomicOrUnionType446=this.p_AtomicOrUnionType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497);
+            p_AtomicOrUnionType433=this.p_AtomicOrUnionType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType446.getTree());
-            // xquery/XQueryParser.g:1291:31: ( QUESTION )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType433.getTree());
+            // xquery/XQueryParser.g:1293:31: ( QUESTION )?
             var alt161=2;
             var LA161_0 = this.input.LA(1);
 
@@ -39934,11 +39979,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt161) {
                 case 1 :
-                    // xquery/XQueryParser.g:1291:31: QUESTION
-                    QUESTION447=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9451); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1293:31: QUESTION
+                    QUESTION434=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9499); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    QUESTION447_tree = this.adaptor.create(QUESTION447);
-                    this.adaptor.addChild(root_0, QUESTION447_tree);
+                    QUESTION434_tree = this.adaptor.create(QUESTION434);
+                    this.adaptor.addChild(root_0, QUESTION434_tree);
                     }
 
 
@@ -39982,7 +40027,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1295:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
+    // xquery/XQueryParser.g:1297:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
     // $ANTLR start "p_TypeDeclaration"
     p_TypeDeclaration: function() {
         var retval = new XQueryParser.p_TypeDeclaration_return();
@@ -39997,15 +40042,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_AS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token AS");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:1296:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
-            // xquery/XQueryParser.g:1296:11: k= AS st= p_SequenceType
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9480); if (this.state.failed) return retval; 
+            // xquery/XQueryParser.g:1298:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
+            // xquery/XQueryParser.g:1298:11: k= AS st= p_SequenceType
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9528); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_AS.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9486);
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9534);
             st=this.p_SequenceType();
 
             this.state._fsp--;
@@ -40025,9 +40070,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1297:17: -> ^( TypeDeclaration $st)
+            // 1299:17: -> ^( TypeDeclaration $st)
             {
-                // xquery/XQueryParser.g:1297:20: ^( TypeDeclaration $st)
+                // xquery/XQueryParser.g:1299:20: ^( TypeDeclaration $st)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(TypeDeclaration, "TypeDeclaration"), root_1);
@@ -40075,7 +40120,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1301:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
+    // xquery/XQueryParser.g:1303:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
     // $ANTLR start "p_SequenceType"
     p_SequenceType: function() {
         var retval = new XQueryParser.p_SequenceType_return();
@@ -40098,7 +40143,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_ItemType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ItemType");
         var stream_p_OccurrenceIndicator=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_OccurrenceIndicator");
         try {
-            // xquery/XQueryParser.g:1302:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
+            // xquery/XQueryParser.g:1304:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
             var alt163=2;
             var LA163_0 = this.input.LA(1);
 
@@ -40131,23 +40176,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt163) {
                 case 1 :
-                    // xquery/XQueryParser.g:1302:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
-                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:1304:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
+                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EMPTY_SEQUENCE.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9545); if (this.state.failed) return retval; 
+                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9593); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LPAREN.add(l);
 
-                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9549); if (this.state.failed) return retval; 
+                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9597); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_RPAREN.add(r);
 
 
 
                     // AST REWRITE
-                    // elements: l, k, r
+                    // elements: k, r, l
                     // token labels: r, l, k
                     // rule labels: retval
                     // token list labels: 
@@ -40160,14 +40205,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1303:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                    // 1305:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                     {
-                        // xquery/XQueryParser.g:1303:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                        // xquery/XQueryParser.g:1305:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
-                        // xquery/XQueryParser.g:1303:35: ^( EmptySequenceTest $k $l $r)
+                        // xquery/XQueryParser.g:1305:35: ^( EmptySequenceTest $k $l $r)
                         {
                         var root_2 = this.adaptor.nil();
                         root_2 = this.adaptor.becomeRoot(this.adaptor.create(EmptySequenceTest, "EmptySequenceTest"), root_2);
@@ -40188,20 +40233,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1304:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9598);
+                    // xquery/XQueryParser.g:1306:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9646);
                     it=this.p_ItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_ItemType.add(it.getTree());
-                    // xquery/XQueryParser.g:1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    // xquery/XQueryParser.g:1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
                     var alt162=2;
                     alt162 = this.dfa162.predict(this.input);
                     switch (alt162) {
                         case 1 :
-                            // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
-                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609);
+                            // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
+                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657);
                             oi=this.p_OccurrenceIndicator();
 
                             this.state._fsp--;
@@ -40228,15 +40273,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_oi=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token oi",oi!=null?oi.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1305:17: -> ^( SequenceType $it ( $oi)? )
+                    // 1307:17: -> ^( SequenceType $it ( $oi)? )
                     {
-                        // xquery/XQueryParser.g:1305:20: ^( SequenceType $it ( $oi)? )
+                        // xquery/XQueryParser.g:1307:20: ^( SequenceType $it ( $oi)? )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
                         this.adaptor.addChild(root_1, stream_it.nextTree());
-                        // xquery/XQueryParser.g:1305:39: ( $oi)?
+                        // xquery/XQueryParser.g:1307:39: ( $oi)?
                         if ( stream_oi.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_oi.nextTree());
 
@@ -40286,7 +40331,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1309:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
+    // xquery/XQueryParser.g:1311:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
     // $ANTLR start "p_OccurrenceIndicator"
     p_OccurrenceIndicator: function() {
         var retval = new XQueryParser.p_OccurrenceIndicator_return();
@@ -40294,19 +40339,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set448 = null;
+        var set435 = null;
 
-        var set448_tree=null;
+        var set435_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1310:9: ( QUESTION | STAR | PLUS )
+            // xquery/XQueryParser.g:1312:9: ( QUESTION | STAR | PLUS )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set448=this.input.LT(1);
+            set435=this.input.LT(1);
             if ( (this.input.LA(1)>=QUESTION && this.input.LA(1)<=PLUS) ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set448));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set435));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -40351,7 +40396,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
+    // xquery/XQueryParser.g:1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
     // $ANTLR start "p_ItemType"
     p_ItemType: function() {
         var retval = new XQueryParser.p_ItemType_return();
@@ -40359,40 +40404,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var BINARY450 = null;
-        var LPAREN451 = null;
-        var RPAREN452 = null;
-        var ITEM453 = null;
-        var LPAREN454 = null;
-        var RPAREN455 = null;
-         var p_KindTest449 = null;
-         var p_AtomicOrUnionType456 = null;
-         var p_ParenthesizedItemType457 = null;
+        var BINARY437 = null;
+        var LPAREN438 = null;
+        var RPAREN439 = null;
+        var ITEM440 = null;
+        var LPAREN441 = null;
+        var RPAREN442 = null;
+         var p_KindTest436 = null;
+         var p_AtomicOrUnionType443 = null;
+         var p_ParenthesizedItemType444 = null;
 
-        var BINARY450_tree=null;
-        var LPAREN451_tree=null;
-        var RPAREN452_tree=null;
-        var ITEM453_tree=null;
-        var LPAREN454_tree=null;
-        var RPAREN455_tree=null;
+        var BINARY437_tree=null;
+        var LPAREN438_tree=null;
+        var RPAREN439_tree=null;
+        var ITEM440_tree=null;
+        var LPAREN441_tree=null;
+        var RPAREN442_tree=null;
         var stream_RPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RPAREN");
         var stream_ITEM=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ITEM");
         var stream_BINARY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BINARY");
         var stream_LPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token LPAREN");
         var stream_p_KindTest=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_KindTest");
         try {
-            // xquery/XQueryParser.g:1315:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
+            // xquery/XQueryParser.g:1317:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
             var alt164=5;
             alt164 = this.dfa164.predict(this.input);
             switch (alt164) {
                 case 1 :
-                    // xquery/XQueryParser.g:1315:11: p_KindTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9711);
-                    p_KindTest449=this.p_KindTest();
+                    // xquery/XQueryParser.g:1317:11: p_KindTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9759);
+                    p_KindTest436=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest449.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest436.getTree());
 
 
                     // AST REWRITE
@@ -40406,9 +40451,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1316:17: -> ^( KindTest p_KindTest )
+                    // 1318:17: -> ^( KindTest p_KindTest )
                     {
-                        // xquery/XQueryParser.g:1316:20: ^( KindTest p_KindTest )
+                        // xquery/XQueryParser.g:1318:20: ^( KindTest p_KindTest )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(KindTest, "KindTest"), root_1);
@@ -40424,21 +40469,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1317:11: {...}? => ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:11: {...}? => ( BINARY LPAREN RPAREN )
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ItemType", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:1317:29: ( BINARY LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1317:30: BINARY LPAREN RPAREN
-                    BINARY450=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9751); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY450);
+                    // xquery/XQueryParser.g:1319:29: ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:30: BINARY LPAREN RPAREN
+                    BINARY437=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9799); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY437);
 
-                    LPAREN451=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9753); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN451);
+                    LPAREN438=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN438);
 
-                    RPAREN452=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9755); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN452);
+                    RPAREN439=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9803); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN439);
 
 
 
@@ -40446,7 +40491,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: LPAREN, RPAREN, BINARY
+                    // elements: BINARY, LPAREN, RPAREN
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -40456,9 +40501,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1318:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
+                    // 1320:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1318:20: ^( BinaryTest BINARY LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1320:20: ^( BinaryTest BINARY LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(BinaryTest, "BinaryTest"), root_1);
@@ -40476,17 +40521,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:12: ITEM LPAREN RPAREN
-                    ITEM453=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9797); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM453);
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:12: ITEM LPAREN RPAREN
+                    ITEM440=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9845); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM440);
 
-                    LPAREN454=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9799); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN454);
+                    LPAREN441=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9847); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN441);
 
-                    RPAREN455=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN455);
+                    RPAREN442=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9849); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN442);
 
 
 
@@ -40494,7 +40539,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: ITEM, RPAREN, LPAREN
+                    // elements: RPAREN, LPAREN, ITEM
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -40504,9 +40549,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1320:17: -> ^( ItemTest ITEM LPAREN RPAREN )
+                    // 1322:17: -> ^( ItemTest ITEM LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1320:20: ^( ItemTest ITEM LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1322:20: ^( ItemTest ITEM LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(ItemTest, "ItemTest"), root_1);
@@ -40524,28 +40569,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1324:11: p_AtomicOrUnionType
+                    // xquery/XQueryParser.g:1326:11: p_AtomicOrUnionType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845);
-                    p_AtomicOrUnionType456=this.p_AtomicOrUnionType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893);
+                    p_AtomicOrUnionType443=this.p_AtomicOrUnionType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType456.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType443.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1325:11: p_ParenthesizedItemType
+                    // xquery/XQueryParser.g:1327:11: p_ParenthesizedItemType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857);
-                    p_ParenthesizedItemType457=this.p_ParenthesizedItemType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905);
+                    p_ParenthesizedItemType444=this.p_ParenthesizedItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType457.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType444.getTree());
 
 
                     break;
@@ -40584,7 +40629,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1329:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
+    // xquery/XQueryParser.g:1331:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
     // $ANTLR start "p_AtomicOrUnionType"
     p_AtomicOrUnionType: function() {
         var retval = new XQueryParser.p_AtomicOrUnionType_return();
@@ -40592,18 +40637,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName458 = null;
+         var p_QName445 = null;
 
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1330:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
-            // xquery/XQueryParser.g:1330:11: p_QName
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9883);
-            p_QName458=this.p_QName();
+            // xquery/XQueryParser.g:1332:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
+            // xquery/XQueryParser.g:1332:11: p_QName
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9931);
+            p_QName445=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName458.getTree());
+            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName445.getTree());
 
 
             // AST REWRITE
@@ -40617,9 +40662,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1331:17: -> ^( AtomicOrUnionType p_QName )
+            // 1333:17: -> ^( AtomicOrUnionType p_QName )
             {
-                // xquery/XQueryParser.g:1331:20: ^( AtomicOrUnionType p_QName )
+                // xquery/XQueryParser.g:1333:20: ^( AtomicOrUnionType p_QName )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AtomicOrUnionType, "AtomicOrUnionType"), root_1);
@@ -40667,7 +40712,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1335:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
+    // xquery/XQueryParser.g:1337:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
     // $ANTLR start "p_KindTest"
     p_KindTest: function() {
         var retval = new XQueryParser.p_KindTest_return();
@@ -40675,20 +40720,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DocumentTest459 = null;
-         var p_ElementTest460 = null;
-         var p_AttributeTest461 = null;
-         var p_SchemaElementTest462 = null;
-         var p_SchemaAttributeTest463 = null;
-         var p_PITest464 = null;
-         var p_CommentTest465 = null;
-         var p_TextTest466 = null;
-         var p_NamespaceNodeTest467 = null;
-         var p_AnyKindTest468 = null;
+         var p_DocumentTest446 = null;
+         var p_ElementTest447 = null;
+         var p_AttributeTest448 = null;
+         var p_SchemaElementTest449 = null;
+         var p_SchemaAttributeTest450 = null;
+         var p_PITest451 = null;
+         var p_CommentTest452 = null;
+         var p_TextTest453 = null;
+         var p_NamespaceNodeTest454 = null;
+         var p_AnyKindTest455 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1336:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
+            // xquery/XQueryParser.g:1338:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
             var alt165=10;
             switch ( this.input.LA(1) ) {
             case DOCUMENT_NODE:
@@ -40731,132 +40776,132 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt165) {
                 case 1 :
-                    // xquery/XQueryParser.g:1336:11: p_DocumentTest
+                    // xquery/XQueryParser.g:1338:11: p_DocumentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9933);
-                    p_DocumentTest459=this.p_DocumentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9981);
+                    p_DocumentTest446=this.p_DocumentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest459.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest446.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1337:11: p_ElementTest
+                    // xquery/XQueryParser.g:1339:11: p_ElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9945);
-                    p_ElementTest460=this.p_ElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9993);
+                    p_ElementTest447=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest460.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest447.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1338:11: p_AttributeTest
+                    // xquery/XQueryParser.g:1340:11: p_AttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest9957);
-                    p_AttributeTest461=this.p_AttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest10005);
+                    p_AttributeTest448=this.p_AttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest461.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest448.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1339:11: p_SchemaElementTest
+                    // xquery/XQueryParser.g:1341:11: p_SchemaElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest9969);
-                    p_SchemaElementTest462=this.p_SchemaElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest10017);
+                    p_SchemaElementTest449=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest449.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1340:11: p_SchemaAttributeTest
+                    // xquery/XQueryParser.g:1342:11: p_SchemaAttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981);
-                    p_SchemaAttributeTest463=this.p_SchemaAttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029);
+                    p_SchemaAttributeTest450=this.p_SchemaAttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest463.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest450.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1341:11: p_PITest
+                    // xquery/XQueryParser.g:1343:11: p_PITest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest9993);
-                    p_PITest464=this.p_PITest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest10041);
+                    p_PITest451=this.p_PITest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest464.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest451.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1342:11: p_CommentTest
+                    // xquery/XQueryParser.g:1344:11: p_CommentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10005);
-                    p_CommentTest465=this.p_CommentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10053);
+                    p_CommentTest452=this.p_CommentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest465.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest452.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1343:11: p_TextTest
+                    // xquery/XQueryParser.g:1345:11: p_TextTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10017);
-                    p_TextTest466=this.p_TextTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10065);
+                    p_TextTest453=this.p_TextTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest466.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest453.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1344:11: p_NamespaceNodeTest
+                    // xquery/XQueryParser.g:1346:11: p_NamespaceNodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029);
-                    p_NamespaceNodeTest467=this.p_NamespaceNodeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077);
+                    p_NamespaceNodeTest454=this.p_NamespaceNodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest467.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest454.getTree());
 
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:1345:11: p_AnyKindTest
+                    // xquery/XQueryParser.g:1347:11: p_AnyKindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10041);
-                    p_AnyKindTest468=this.p_AnyKindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10089);
+                    p_AnyKindTest455=this.p_AnyKindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest468.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest455.getTree());
 
 
                     break;
@@ -40895,7 +40940,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1349:1: p_AnyKindTest : NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1351:1: p_AnyKindTest : NODE LPAREN RPAREN ;
     // $ANTLR start "p_AnyKindTest"
     p_AnyKindTest: function() {
         var retval = new XQueryParser.p_AnyKindTest_return();
@@ -40903,33 +40948,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NODE469 = null;
-        var LPAREN470 = null;
-        var RPAREN471 = null;
+        var NODE456 = null;
+        var LPAREN457 = null;
+        var RPAREN458 = null;
 
-        var NODE469_tree=null;
-        var LPAREN470_tree=null;
-        var RPAREN471_tree=null;
+        var NODE456_tree=null;
+        var LPAREN457_tree=null;
+        var RPAREN458_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1350:9: ( NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1350:11: NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1352:9: ( NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1352:11: NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NODE469=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10067); if (this.state.failed) return retval;
+            NODE456=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10115); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NODE469_tree = this.adaptor.create(NODE469);
-            this.adaptor.addChild(root_0, NODE469_tree);
+            NODE456_tree = this.adaptor.create(NODE456);
+            this.adaptor.addChild(root_0, NODE456_tree);
             }
-            LPAREN470=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10069); if (this.state.failed) return retval;
+            LPAREN457=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10117); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN470_tree = this.adaptor.create(LPAREN470);
-            this.adaptor.addChild(root_0, LPAREN470_tree);
+            LPAREN457_tree = this.adaptor.create(LPAREN457);
+            this.adaptor.addChild(root_0, LPAREN457_tree);
             }
-            RPAREN471=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10071); if (this.state.failed) return retval;
+            RPAREN458=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10119); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN471_tree = this.adaptor.create(RPAREN471);
-            this.adaptor.addChild(root_0, RPAREN471_tree);
+            RPAREN458_tree = this.adaptor.create(RPAREN458);
+            this.adaptor.addChild(root_0, RPAREN458_tree);
             }
 
 
@@ -40967,7 +41012,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1354:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
+    // xquery/XQueryParser.g:1356:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
     // $ANTLR start "p_DocumentTest"
     p_DocumentTest: function() {
         var retval = new XQueryParser.p_DocumentTest_return();
@@ -40975,32 +41020,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOCUMENT_NODE472 = null;
-        var LPAREN473 = null;
-        var RPAREN476 = null;
-         var p_ElementTest474 = null;
-         var p_SchemaElementTest475 = null;
+        var DOCUMENT_NODE459 = null;
+        var LPAREN460 = null;
+        var RPAREN463 = null;
+         var p_ElementTest461 = null;
+         var p_SchemaElementTest462 = null;
 
-        var DOCUMENT_NODE472_tree=null;
-        var LPAREN473_tree=null;
-        var RPAREN476_tree=null;
+        var DOCUMENT_NODE459_tree=null;
+        var LPAREN460_tree=null;
+        var RPAREN463_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1355:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
-            // xquery/XQueryParser.g:1355:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
+            // xquery/XQueryParser.g:1357:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
+            // xquery/XQueryParser.g:1357:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
             root_0 = this.adaptor.nil();
 
-            DOCUMENT_NODE472=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097); if (this.state.failed) return retval;
+            DOCUMENT_NODE459=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOCUMENT_NODE472_tree = this.adaptor.create(DOCUMENT_NODE472);
-            this.adaptor.addChild(root_0, DOCUMENT_NODE472_tree);
+            DOCUMENT_NODE459_tree = this.adaptor.create(DOCUMENT_NODE459);
+            this.adaptor.addChild(root_0, DOCUMENT_NODE459_tree);
             }
-            LPAREN473=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10099); if (this.state.failed) return retval;
+            LPAREN460=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10147); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN473_tree = this.adaptor.create(LPAREN473);
-            this.adaptor.addChild(root_0, LPAREN473_tree);
+            LPAREN460_tree = this.adaptor.create(LPAREN460);
+            this.adaptor.addChild(root_0, LPAREN460_tree);
             }
-            // xquery/XQueryParser.g:1355:32: ( p_ElementTest | p_SchemaElementTest )?
+            // xquery/XQueryParser.g:1357:32: ( p_ElementTest | p_SchemaElementTest )?
             var alt166=3;
             var LA166_0 = this.input.LA(1);
 
@@ -41012,34 +41057,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt166) {
                 case 1 :
-                    // xquery/XQueryParser.g:1355:33: p_ElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10102);
-                    p_ElementTest474=this.p_ElementTest();
+                    // xquery/XQueryParser.g:1357:33: p_ElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10150);
+                    p_ElementTest461=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest474.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest461.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1355:49: p_SchemaElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106);
-                    p_SchemaElementTest475=this.p_SchemaElementTest();
+                    // xquery/XQueryParser.g:1357:49: p_SchemaElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154);
+                    p_SchemaElementTest462=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest475.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
 
 
                     break;
 
             }
 
-            RPAREN476=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10110); if (this.state.failed) return retval;
+            RPAREN463=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10158); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN476_tree = this.adaptor.create(RPAREN476);
-            this.adaptor.addChild(root_0, RPAREN476_tree);
+            RPAREN463_tree = this.adaptor.create(RPAREN463);
+            this.adaptor.addChild(root_0, RPAREN463_tree);
             }
 
 
@@ -41077,7 +41122,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1359:1: p_TextTest : TEXT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1361:1: p_TextTest : TEXT LPAREN RPAREN ;
     // $ANTLR start "p_TextTest"
     p_TextTest: function() {
         var retval = new XQueryParser.p_TextTest_return();
@@ -41085,33 +41130,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var TEXT477 = null;
-        var LPAREN478 = null;
-        var RPAREN479 = null;
+        var TEXT464 = null;
+        var LPAREN465 = null;
+        var RPAREN466 = null;
 
-        var TEXT477_tree=null;
-        var LPAREN478_tree=null;
-        var RPAREN479_tree=null;
+        var TEXT464_tree=null;
+        var LPAREN465_tree=null;
+        var RPAREN466_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1360:9: ( TEXT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1360:11: TEXT LPAREN RPAREN
+            // xquery/XQueryParser.g:1362:9: ( TEXT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1362:11: TEXT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            TEXT477=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10136); if (this.state.failed) return retval;
+            TEXT464=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10184); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            TEXT477_tree = this.adaptor.create(TEXT477);
-            this.adaptor.addChild(root_0, TEXT477_tree);
+            TEXT464_tree = this.adaptor.create(TEXT464);
+            this.adaptor.addChild(root_0, TEXT464_tree);
             }
-            LPAREN478=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10138); if (this.state.failed) return retval;
+            LPAREN465=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10186); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN478_tree = this.adaptor.create(LPAREN478);
-            this.adaptor.addChild(root_0, LPAREN478_tree);
+            LPAREN465_tree = this.adaptor.create(LPAREN465);
+            this.adaptor.addChild(root_0, LPAREN465_tree);
             }
-            RPAREN479=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10140); if (this.state.failed) return retval;
+            RPAREN466=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10188); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN479_tree = this.adaptor.create(RPAREN479);
-            this.adaptor.addChild(root_0, RPAREN479_tree);
+            RPAREN466_tree = this.adaptor.create(RPAREN466);
+            this.adaptor.addChild(root_0, RPAREN466_tree);
             }
 
 
@@ -41149,7 +41194,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1364:1: p_CommentTest : COMMENT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1366:1: p_CommentTest : COMMENT LPAREN RPAREN ;
     // $ANTLR start "p_CommentTest"
     p_CommentTest: function() {
         var retval = new XQueryParser.p_CommentTest_return();
@@ -41157,33 +41202,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMENT480 = null;
-        var LPAREN481 = null;
-        var RPAREN482 = null;
+        var COMMENT467 = null;
+        var LPAREN468 = null;
+        var RPAREN469 = null;
 
-        var COMMENT480_tree=null;
-        var LPAREN481_tree=null;
-        var RPAREN482_tree=null;
+        var COMMENT467_tree=null;
+        var LPAREN468_tree=null;
+        var RPAREN469_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1365:9: ( COMMENT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1365:11: COMMENT LPAREN RPAREN
+            // xquery/XQueryParser.g:1367:9: ( COMMENT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1367:11: COMMENT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            COMMENT480=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10166); if (this.state.failed) return retval;
+            COMMENT467=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10214); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            COMMENT480_tree = this.adaptor.create(COMMENT480);
-            this.adaptor.addChild(root_0, COMMENT480_tree);
+            COMMENT467_tree = this.adaptor.create(COMMENT467);
+            this.adaptor.addChild(root_0, COMMENT467_tree);
             }
-            LPAREN481=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10168); if (this.state.failed) return retval;
+            LPAREN468=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN481_tree = this.adaptor.create(LPAREN481);
-            this.adaptor.addChild(root_0, LPAREN481_tree);
+            LPAREN468_tree = this.adaptor.create(LPAREN468);
+            this.adaptor.addChild(root_0, LPAREN468_tree);
             }
-            RPAREN482=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10170); if (this.state.failed) return retval;
+            RPAREN469=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10218); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN482_tree = this.adaptor.create(RPAREN482);
-            this.adaptor.addChild(root_0, RPAREN482_tree);
+            RPAREN469_tree = this.adaptor.create(RPAREN469);
+            this.adaptor.addChild(root_0, RPAREN469_tree);
             }
 
 
@@ -41221,7 +41266,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1369:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1371:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
     // $ANTLR start "p_NamespaceNodeTest"
     p_NamespaceNodeTest: function() {
         var retval = new XQueryParser.p_NamespaceNodeTest_return();
@@ -41229,33 +41274,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NAMESPACE_NODE483 = null;
-        var LPAREN484 = null;
-        var RPAREN485 = null;
+        var NAMESPACE_NODE470 = null;
+        var LPAREN471 = null;
+        var RPAREN472 = null;
 
-        var NAMESPACE_NODE483_tree=null;
-        var LPAREN484_tree=null;
-        var RPAREN485_tree=null;
+        var NAMESPACE_NODE470_tree=null;
+        var LPAREN471_tree=null;
+        var RPAREN472_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1370:9: ( NAMESPACE_NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1370:11: NAMESPACE_NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1372:9: ( NAMESPACE_NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1372:11: NAMESPACE_NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NAMESPACE_NODE483=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196); if (this.state.failed) return retval;
+            NAMESPACE_NODE470=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NAMESPACE_NODE483_tree = this.adaptor.create(NAMESPACE_NODE483);
-            this.adaptor.addChild(root_0, NAMESPACE_NODE483_tree);
+            NAMESPACE_NODE470_tree = this.adaptor.create(NAMESPACE_NODE470);
+            this.adaptor.addChild(root_0, NAMESPACE_NODE470_tree);
             }
-            LPAREN484=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10198); if (this.state.failed) return retval;
+            LPAREN471=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10246); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN484_tree = this.adaptor.create(LPAREN484);
-            this.adaptor.addChild(root_0, LPAREN484_tree);
+            LPAREN471_tree = this.adaptor.create(LPAREN471);
+            this.adaptor.addChild(root_0, LPAREN471_tree);
             }
-            RPAREN485=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10200); if (this.state.failed) return retval;
+            RPAREN472=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10248); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN485_tree = this.adaptor.create(RPAREN485);
-            this.adaptor.addChild(root_0, RPAREN485_tree);
+            RPAREN472_tree = this.adaptor.create(RPAREN472);
+            this.adaptor.addChild(root_0, RPAREN472_tree);
             }
 
 
@@ -41293,7 +41338,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1374:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
+    // xquery/XQueryParser.g:1376:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
     // $ANTLR start "p_PITest"
     p_PITest: function() {
         var retval = new XQueryParser.p_PITest_return();
@@ -41301,32 +41346,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PROCESSING_INSTRUCTION486 = null;
-        var LPAREN487 = null;
-        var RPAREN490 = null;
-         var p_NCName488 = null;
-         var p_StringLiteral489 = null;
+        var PROCESSING_INSTRUCTION473 = null;
+        var LPAREN474 = null;
+        var RPAREN477 = null;
+         var p_NCName475 = null;
+         var p_StringLiteral476 = null;
 
-        var PROCESSING_INSTRUCTION486_tree=null;
-        var LPAREN487_tree=null;
-        var RPAREN490_tree=null;
+        var PROCESSING_INSTRUCTION473_tree=null;
+        var LPAREN474_tree=null;
+        var RPAREN477_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1375:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
-            // xquery/XQueryParser.g:1375:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
+            // xquery/XQueryParser.g:1377:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
+            // xquery/XQueryParser.g:1377:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
             root_0 = this.adaptor.nil();
 
-            PROCESSING_INSTRUCTION486=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226); if (this.state.failed) return retval;
+            PROCESSING_INSTRUCTION473=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            PROCESSING_INSTRUCTION486_tree = this.adaptor.create(PROCESSING_INSTRUCTION486);
-            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION486_tree);
+            PROCESSING_INSTRUCTION473_tree = this.adaptor.create(PROCESSING_INSTRUCTION473);
+            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION473_tree);
             }
-            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10228); if (this.state.failed) return retval;
+            LPAREN474=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10276); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN487_tree = this.adaptor.create(LPAREN487);
-            this.adaptor.addChild(root_0, LPAREN487_tree);
+            LPAREN474_tree = this.adaptor.create(LPAREN474);
+            this.adaptor.addChild(root_0, LPAREN474_tree);
             }
-            // xquery/XQueryParser.g:1375:41: ( p_NCName | p_StringLiteral )?
+            // xquery/XQueryParser.g:1377:41: ( p_NCName | p_StringLiteral )?
             var alt167=3;
             var LA167_0 = this.input.LA(1);
 
@@ -41338,34 +41383,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt167) {
                 case 1 :
-                    // xquery/XQueryParser.g:1375:42: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10231);
-                    p_NCName488=this.p_NCName();
+                    // xquery/XQueryParser.g:1377:42: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10279);
+                    p_NCName475=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName488.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName475.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1375:53: p_StringLiteral
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10235);
-                    p_StringLiteral489=this.p_StringLiteral();
+                    // xquery/XQueryParser.g:1377:53: p_StringLiteral
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10283);
+                    p_StringLiteral476=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral489.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral476.getTree());
 
 
                     break;
 
             }
 
-            RPAREN490=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10239); if (this.state.failed) return retval;
+            RPAREN477=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10287); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN490_tree = this.adaptor.create(RPAREN490);
-            this.adaptor.addChild(root_0, RPAREN490_tree);
+            RPAREN477_tree = this.adaptor.create(RPAREN477);
+            this.adaptor.addChild(root_0, RPAREN477_tree);
             }
 
 
@@ -41403,7 +41448,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1379:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
+    // xquery/XQueryParser.g:1381:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
     // $ANTLR start "p_AttributeTest"
     p_AttributeTest: function() {
         var retval = new XQueryParser.p_AttributeTest_return();
@@ -41411,34 +41456,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTRIBUTE491 = null;
-        var LPAREN492 = null;
-        var COMMA494 = null;
-        var RPAREN496 = null;
-         var p_AttribNameOrWildcard493 = null;
-         var p_TypeName495 = null;
+        var ATTRIBUTE478 = null;
+        var LPAREN479 = null;
+        var COMMA481 = null;
+        var RPAREN483 = null;
+         var p_AttribNameOrWildcard480 = null;
+         var p_TypeName482 = null;
 
-        var ATTRIBUTE491_tree=null;
-        var LPAREN492_tree=null;
-        var COMMA494_tree=null;
-        var RPAREN496_tree=null;
+        var ATTRIBUTE478_tree=null;
+        var LPAREN479_tree=null;
+        var COMMA481_tree=null;
+        var RPAREN483_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1380:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
-            // xquery/XQueryParser.g:1380:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
+            // xquery/XQueryParser.g:1382:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
+            // xquery/XQueryParser.g:1382:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ATTRIBUTE491=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10265); if (this.state.failed) return retval;
+            ATTRIBUTE478=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10313); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ATTRIBUTE491_tree = this.adaptor.create(ATTRIBUTE491);
-            this.adaptor.addChild(root_0, ATTRIBUTE491_tree);
+            ATTRIBUTE478_tree = this.adaptor.create(ATTRIBUTE478);
+            this.adaptor.addChild(root_0, ATTRIBUTE478_tree);
             }
-            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10267); if (this.state.failed) return retval;
+            LPAREN479=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10315); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN492_tree = this.adaptor.create(LPAREN492);
-            this.adaptor.addChild(root_0, LPAREN492_tree);
+            LPAREN479_tree = this.adaptor.create(LPAREN479);
+            this.adaptor.addChild(root_0, LPAREN479_tree);
             }
-            // xquery/XQueryParser.g:1380:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
+            // xquery/XQueryParser.g:1382:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
             var alt169=2;
             var LA169_0 = this.input.LA(1);
 
@@ -41447,14 +41492,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt169) {
                 case 1 :
-                    // xquery/XQueryParser.g:1380:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270);
-                    p_AttribNameOrWildcard493=this.p_AttribNameOrWildcard();
+                    // xquery/XQueryParser.g:1382:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318);
+                    p_AttribNameOrWildcard480=this.p_AttribNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard493.getTree());
-                    // xquery/XQueryParser.g:1380:52: ( COMMA p_TypeName )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard480.getTree());
+                    // xquery/XQueryParser.g:1382:52: ( COMMA p_TypeName )?
                     var alt168=2;
                     var LA168_0 = this.input.LA(1);
 
@@ -41463,18 +41508,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt168) {
                         case 1 :
-                            // xquery/XQueryParser.g:1380:53: COMMA p_TypeName
-                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10273); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1382:53: COMMA p_TypeName
+                            COMMA481=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10321); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA494_tree = this.adaptor.create(COMMA494);
-                            this.adaptor.addChild(root_0, COMMA494_tree);
+                            COMMA481_tree = this.adaptor.create(COMMA481);
+                            this.adaptor.addChild(root_0, COMMA481_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10275);
-                            p_TypeName495=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10323);
+                            p_TypeName482=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName482.getTree());
 
 
                             break;
@@ -41487,10 +41532,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN496=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10281); if (this.state.failed) return retval;
+            RPAREN483=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10329); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN496_tree = this.adaptor.create(RPAREN496);
-            this.adaptor.addChild(root_0, RPAREN496_tree);
+            RPAREN483_tree = this.adaptor.create(RPAREN483);
+            this.adaptor.addChild(root_0, RPAREN483_tree);
             }
 
 
@@ -41528,7 +41573,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1384:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
+    // xquery/XQueryParser.g:1386:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
     // $ANTLR start "p_AttribNameOrWildcard"
     p_AttribNameOrWildcard: function() {
         var retval = new XQueryParser.p_AttribNameOrWildcard_return();
@@ -41536,13 +41581,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR498 = null;
-         var p_AttributeName497 = null;
+        var STAR485 = null;
+         var p_AttributeName484 = null;
 
-        var STAR498_tree=null;
+        var STAR485_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1385:9: ( p_AttributeName | STAR )
+            // xquery/XQueryParser.g:1387:9: ( p_AttributeName | STAR )
             var alt170=2;
             var LA170_0 = this.input.LA(1);
 
@@ -41561,26 +41606,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt170) {
                 case 1 :
-                    // xquery/XQueryParser.g:1385:11: p_AttributeName
+                    // xquery/XQueryParser.g:1387:11: p_AttributeName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309);
-                    p_AttributeName497=this.p_AttributeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357);
+                    p_AttributeName484=this.p_AttributeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName497.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName484.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1385:29: STAR
+                    // xquery/XQueryParser.g:1387:29: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR498=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10313); if (this.state.failed) return retval;
+                    STAR485=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10361); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR498_tree = this.adaptor.create(STAR498);
-                    this.adaptor.addChild(root_0, STAR498_tree);
+                    STAR485_tree = this.adaptor.create(STAR485);
+                    this.adaptor.addChild(root_0, STAR485_tree);
                     }
 
 
@@ -41620,7 +41665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1389:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1391:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
     // $ANTLR start "p_SchemaAttributeTest"
     p_SchemaAttributeTest: function() {
         var retval = new XQueryParser.p_SchemaAttributeTest_return();
@@ -41628,40 +41673,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ATTRIBUTE499 = null;
-        var LPAREN500 = null;
-        var RPAREN502 = null;
-         var p_AttributeDeclaration501 = null;
+        var SCHEMA_ATTRIBUTE486 = null;
+        var LPAREN487 = null;
+        var RPAREN489 = null;
+         var p_AttributeDeclaration488 = null;
 
-        var SCHEMA_ATTRIBUTE499_tree=null;
-        var LPAREN500_tree=null;
-        var RPAREN502_tree=null;
+        var SCHEMA_ATTRIBUTE486_tree=null;
+        var LPAREN487_tree=null;
+        var RPAREN489_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1390:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
-            // xquery/XQueryParser.g:1390:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
+            // xquery/XQueryParser.g:1392:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
+            // xquery/XQueryParser.g:1392:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ATTRIBUTE499=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339); if (this.state.failed) return retval;
+            SCHEMA_ATTRIBUTE486=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ATTRIBUTE499_tree = this.adaptor.create(SCHEMA_ATTRIBUTE499);
-            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE499_tree);
+            SCHEMA_ATTRIBUTE486_tree = this.adaptor.create(SCHEMA_ATTRIBUTE486);
+            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE486_tree);
             }
-            LPAREN500=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10341); if (this.state.failed) return retval;
+            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10389); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN500_tree = this.adaptor.create(LPAREN500);
-            this.adaptor.addChild(root_0, LPAREN500_tree);
+            LPAREN487_tree = this.adaptor.create(LPAREN487);
+            this.adaptor.addChild(root_0, LPAREN487_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343);
-            p_AttributeDeclaration501=this.p_AttributeDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391);
+            p_AttributeDeclaration488=this.p_AttributeDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration501.getTree());
-            RPAREN502=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration488.getTree());
+            RPAREN489=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN502_tree = this.adaptor.create(RPAREN502);
-            this.adaptor.addChild(root_0, RPAREN502_tree);
+            RPAREN489_tree = this.adaptor.create(RPAREN489);
+            this.adaptor.addChild(root_0, RPAREN489_tree);
             }
 
 
@@ -41699,7 +41744,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1394:1: p_AttributeDeclaration : p_AttributeName ;
+    // xquery/XQueryParser.g:1396:1: p_AttributeDeclaration : p_AttributeName ;
     // $ANTLR start "p_AttributeDeclaration"
     p_AttributeDeclaration: function() {
         var retval = new XQueryParser.p_AttributeDeclaration_return();
@@ -41707,20 +41752,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AttributeName503 = null;
+         var p_AttributeName490 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1395:9: ( p_AttributeName )
-            // xquery/XQueryParser.g:1395:11: p_AttributeName
+            // xquery/XQueryParser.g:1397:9: ( p_AttributeName )
+            // xquery/XQueryParser.g:1397:11: p_AttributeName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371);
-            p_AttributeName503=this.p_AttributeName();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419);
+            p_AttributeName490=this.p_AttributeName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName503.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName490.getTree());
 
 
 
@@ -41757,7 +41802,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1399:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
+    // xquery/XQueryParser.g:1401:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
     // $ANTLR start "p_ElementTest"
     p_ElementTest: function() {
         var retval = new XQueryParser.p_ElementTest_return();
@@ -41765,36 +41810,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ELEMENT504 = null;
-        var LPAREN505 = null;
-        var COMMA507 = null;
-        var QUESTION509 = null;
-        var RPAREN510 = null;
-         var p_ElementNameOrWildcard506 = null;
-         var p_TypeName508 = null;
+        var ELEMENT491 = null;
+        var LPAREN492 = null;
+        var COMMA494 = null;
+        var QUESTION496 = null;
+        var RPAREN497 = null;
+         var p_ElementNameOrWildcard493 = null;
+         var p_TypeName495 = null;
 
-        var ELEMENT504_tree=null;
-        var LPAREN505_tree=null;
-        var COMMA507_tree=null;
-        var QUESTION509_tree=null;
-        var RPAREN510_tree=null;
+        var ELEMENT491_tree=null;
+        var LPAREN492_tree=null;
+        var COMMA494_tree=null;
+        var QUESTION496_tree=null;
+        var RPAREN497_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1400:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
-            // xquery/XQueryParser.g:1400:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
+            // xquery/XQueryParser.g:1402:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
+            // xquery/XQueryParser.g:1402:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ELEMENT504=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10397); if (this.state.failed) return retval;
+            ELEMENT491=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ELEMENT504_tree = this.adaptor.create(ELEMENT504);
-            this.adaptor.addChild(root_0, ELEMENT504_tree);
+            ELEMENT491_tree = this.adaptor.create(ELEMENT491);
+            this.adaptor.addChild(root_0, ELEMENT491_tree);
             }
-            LPAREN505=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10399); if (this.state.failed) return retval;
+            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10447); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN505_tree = this.adaptor.create(LPAREN505);
-            this.adaptor.addChild(root_0, LPAREN505_tree);
+            LPAREN492_tree = this.adaptor.create(LPAREN492);
+            this.adaptor.addChild(root_0, LPAREN492_tree);
             }
-            // xquery/XQueryParser.g:1400:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
+            // xquery/XQueryParser.g:1402:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
             var alt173=2;
             var LA173_0 = this.input.LA(1);
 
@@ -41803,14 +41848,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt173) {
                 case 1 :
-                    // xquery/XQueryParser.g:1400:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402);
-                    p_ElementNameOrWildcard506=this.p_ElementNameOrWildcard();
+                    // xquery/XQueryParser.g:1402:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450);
+                    p_ElementNameOrWildcard493=this.p_ElementNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard506.getTree());
-                    // xquery/XQueryParser.g:1400:51: ( COMMA p_TypeName ( QUESTION )? )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard493.getTree());
+                    // xquery/XQueryParser.g:1402:51: ( COMMA p_TypeName ( QUESTION )? )?
                     var alt172=2;
                     var LA172_0 = this.input.LA(1);
 
@@ -41819,19 +41864,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt172) {
                         case 1 :
-                            // xquery/XQueryParser.g:1400:52: COMMA p_TypeName ( QUESTION )?
-                            COMMA507=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10405); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1402:52: COMMA p_TypeName ( QUESTION )?
+                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10453); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA507_tree = this.adaptor.create(COMMA507);
-                            this.adaptor.addChild(root_0, COMMA507_tree);
+                            COMMA494_tree = this.adaptor.create(COMMA494);
+                            this.adaptor.addChild(root_0, COMMA494_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10407);
-                            p_TypeName508=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10455);
+                            p_TypeName495=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName508.getTree());
-                            // xquery/XQueryParser.g:1400:69: ( QUESTION )?
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            // xquery/XQueryParser.g:1402:69: ( QUESTION )?
                             var alt171=2;
                             var LA171_0 = this.input.LA(1);
 
@@ -41840,11 +41885,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt171) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1400:69: QUESTION
-                                    QUESTION509=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10409); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1402:69: QUESTION
+                                    QUESTION496=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10457); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    QUESTION509_tree = this.adaptor.create(QUESTION509);
-                                    this.adaptor.addChild(root_0, QUESTION509_tree);
+                                    QUESTION496_tree = this.adaptor.create(QUESTION496);
+                                    this.adaptor.addChild(root_0, QUESTION496_tree);
                                     }
 
 
@@ -41864,10 +41909,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN510=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10416); if (this.state.failed) return retval;
+            RPAREN497=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10464); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN510_tree = this.adaptor.create(RPAREN510);
-            this.adaptor.addChild(root_0, RPAREN510_tree);
+            RPAREN497_tree = this.adaptor.create(RPAREN497);
+            this.adaptor.addChild(root_0, RPAREN497_tree);
             }
 
 
@@ -41905,7 +41950,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1404:1: p_ElementNameOrWildcard : ( p_QName | STAR );
+    // xquery/XQueryParser.g:1406:1: p_ElementNameOrWildcard : ( p_QName | STAR );
     // $ANTLR start "p_ElementNameOrWildcard"
     p_ElementNameOrWildcard: function() {
         var retval = new XQueryParser.p_ElementNameOrWildcard_return();
@@ -41913,13 +41958,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR512 = null;
-         var p_QName511 = null;
+        var STAR499 = null;
+         var p_QName498 = null;
 
-        var STAR512_tree=null;
+        var STAR499_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1405:9: ( p_QName | STAR )
+            // xquery/XQueryParser.g:1407:9: ( p_QName | STAR )
             var alt174=2;
             var LA174_0 = this.input.LA(1);
 
@@ -41938,26 +41983,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt174) {
                 case 1 :
-                    // xquery/XQueryParser.g:1405:11: p_QName
+                    // xquery/XQueryParser.g:1407:11: p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10442);
-                    p_QName511=this.p_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10490);
+                    p_QName498=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName511.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName498.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1405:21: STAR
+                    // xquery/XQueryParser.g:1407:21: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR512=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10446); if (this.state.failed) return retval;
+                    STAR499=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR512_tree = this.adaptor.create(STAR512);
-                    this.adaptor.addChild(root_0, STAR512_tree);
+                    STAR499_tree = this.adaptor.create(STAR499);
+                    this.adaptor.addChild(root_0, STAR499_tree);
                     }
 
 
@@ -41997,7 +42042,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1408:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1410:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
     // $ANTLR start "p_SchemaElementTest"
     p_SchemaElementTest: function() {
         var retval = new XQueryParser.p_SchemaElementTest_return();
@@ -42005,40 +42050,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ELEMENT513 = null;
-        var LPAREN514 = null;
-        var RPAREN516 = null;
-         var p_ElementDeclaration515 = null;
+        var SCHEMA_ELEMENT500 = null;
+        var LPAREN501 = null;
+        var RPAREN503 = null;
+         var p_ElementDeclaration502 = null;
 
-        var SCHEMA_ELEMENT513_tree=null;
-        var LPAREN514_tree=null;
-        var RPAREN516_tree=null;
+        var SCHEMA_ELEMENT500_tree=null;
+        var LPAREN501_tree=null;
+        var RPAREN503_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1409:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
-            // xquery/XQueryParser.g:1409:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
+            // xquery/XQueryParser.g:1411:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
+            // xquery/XQueryParser.g:1411:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ELEMENT513=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464); if (this.state.failed) return retval;
+            SCHEMA_ELEMENT500=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ELEMENT513_tree = this.adaptor.create(SCHEMA_ELEMENT513);
-            this.adaptor.addChild(root_0, SCHEMA_ELEMENT513_tree);
+            SCHEMA_ELEMENT500_tree = this.adaptor.create(SCHEMA_ELEMENT500);
+            this.adaptor.addChild(root_0, SCHEMA_ELEMENT500_tree);
             }
-            LPAREN514=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10466); if (this.state.failed) return retval;
+            LPAREN501=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10514); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN514_tree = this.adaptor.create(LPAREN514);
-            this.adaptor.addChild(root_0, LPAREN514_tree);
+            LPAREN501_tree = this.adaptor.create(LPAREN501);
+            this.adaptor.addChild(root_0, LPAREN501_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468);
-            p_ElementDeclaration515=this.p_ElementDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516);
+            p_ElementDeclaration502=this.p_ElementDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration515.getTree());
-            RPAREN516=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10470); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration502.getTree());
+            RPAREN503=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN516_tree = this.adaptor.create(RPAREN516);
-            this.adaptor.addChild(root_0, RPAREN516_tree);
+            RPAREN503_tree = this.adaptor.create(RPAREN503);
+            this.adaptor.addChild(root_0, RPAREN503_tree);
             }
 
 
@@ -42076,7 +42121,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1413:1: p_ElementDeclaration : p_ElementName ;
+    // xquery/XQueryParser.g:1415:1: p_ElementDeclaration : p_ElementName ;
     // $ANTLR start "p_ElementDeclaration"
     p_ElementDeclaration: function() {
         var retval = new XQueryParser.p_ElementDeclaration_return();
@@ -42084,20 +42129,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ElementName517 = null;
+         var p_ElementName504 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1414:9: ( p_ElementName )
-            // xquery/XQueryParser.g:1414:11: p_ElementName
+            // xquery/XQueryParser.g:1416:9: ( p_ElementName )
+            // xquery/XQueryParser.g:1416:11: p_ElementName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10496);
-            p_ElementName517=this.p_ElementName();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10544);
+            p_ElementName504=this.p_ElementName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName517.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName504.getTree());
 
 
 
@@ -42134,7 +42179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1418:1: p_AttributeName : p_QName ;
+    // xquery/XQueryParser.g:1420:1: p_AttributeName : p_QName ;
     // $ANTLR start "p_AttributeName"
     p_AttributeName: function() {
         var retval = new XQueryParser.p_AttributeName_return();
@@ -42142,20 +42187,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName518 = null;
+         var p_QName505 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1419:9: ( p_QName )
-            // xquery/XQueryParser.g:1419:11: p_QName
+            // xquery/XQueryParser.g:1421:9: ( p_QName )
+            // xquery/XQueryParser.g:1421:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10522);
-            p_QName518=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10570);
+            p_QName505=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName518.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName505.getTree());
 
 
 
@@ -42192,7 +42237,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1423:1: p_ElementName : p_QName ;
+    // xquery/XQueryParser.g:1425:1: p_ElementName : p_QName ;
     // $ANTLR start "p_ElementName"
     p_ElementName: function() {
         var retval = new XQueryParser.p_ElementName_return();
@@ -42200,20 +42245,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName519 = null;
+         var p_QName506 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1424:9: ( p_QName )
-            // xquery/XQueryParser.g:1424:11: p_QName
+            // xquery/XQueryParser.g:1426:9: ( p_QName )
+            // xquery/XQueryParser.g:1426:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10548);
-            p_QName519=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10596);
+            p_QName506=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName519.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName506.getTree());
 
 
 
@@ -42250,7 +42295,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1428:1: p_TypeName : p_QName ;
+    // xquery/XQueryParser.g:1430:1: p_TypeName : p_QName ;
     // $ANTLR start "p_TypeName"
     p_TypeName: function() {
         var retval = new XQueryParser.p_TypeName_return();
@@ -42258,20 +42303,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName520 = null;
+         var p_QName507 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1429:9: ( p_QName )
-            // xquery/XQueryParser.g:1429:11: p_QName
+            // xquery/XQueryParser.g:1431:9: ( p_QName )
+            // xquery/XQueryParser.g:1431:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10574);
-            p_QName520=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10622);
+            p_QName507=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName520.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName507.getTree());
 
 
 
@@ -42308,7 +42353,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1433:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
+    // xquery/XQueryParser.g:1435:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
     // $ANTLR start "p_FunctionTest"
     p_FunctionTest: function() {
         var retval = new XQueryParser.p_FunctionTest_return();
@@ -42316,17 +42361,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Annotation521 = null;
-         var p_AnyFunctionTest522 = null;
-         var p_TypedFunctionTest523 = null;
+         var p_Annotation508 = null;
+         var p_AnyFunctionTest509 = null;
+         var p_TypedFunctionTest510 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1434:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )*
             loop175:
             do {
                 var alt175=2;
@@ -42339,13 +42384,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt175) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10600);
-                    p_Annotation521=this.p_Annotation();
+                    // xquery/XQueryParser.g:1436:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10648);
+                    p_Annotation508=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation521.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation508.getTree());
 
 
                     break;
@@ -42355,7 +42400,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:1434:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
             var alt176=2;
             var LA176_0 = this.input.LA(1);
 
@@ -42396,24 +42441,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt176) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:26: p_AnyFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604);
-                    p_AnyFunctionTest522=this.p_AnyFunctionTest();
+                    // xquery/XQueryParser.g:1436:26: p_AnyFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652);
+                    p_AnyFunctionTest509=this.p_AnyFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest522.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest509.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1434:46: p_TypedFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608);
-                    p_TypedFunctionTest523=this.p_TypedFunctionTest();
+                    // xquery/XQueryParser.g:1436:46: p_TypedFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656);
+                    p_TypedFunctionTest510=this.p_TypedFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest523.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest510.getTree());
 
 
                     break;
@@ -42456,7 +42501,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1438:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
+    // xquery/XQueryParser.g:1440:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
     // $ANTLR start "p_AnyFunctionTest"
     p_AnyFunctionTest: function() {
         var retval = new XQueryParser.p_AnyFunctionTest_return();
@@ -42464,40 +42509,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION524 = null;
-        var LPAREN525 = null;
-        var STAR526 = null;
-        var RPAREN527 = null;
+        var FUNCTION511 = null;
+        var LPAREN512 = null;
+        var STAR513 = null;
+        var RPAREN514 = null;
 
-        var FUNCTION524_tree=null;
-        var LPAREN525_tree=null;
-        var STAR526_tree=null;
-        var RPAREN527_tree=null;
+        var FUNCTION511_tree=null;
+        var LPAREN512_tree=null;
+        var STAR513_tree=null;
+        var RPAREN514_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1439:9: ( FUNCTION LPAREN STAR RPAREN )
-            // xquery/XQueryParser.g:1439:11: FUNCTION LPAREN STAR RPAREN
+            // xquery/XQueryParser.g:1441:9: ( FUNCTION LPAREN STAR RPAREN )
+            // xquery/XQueryParser.g:1441:11: FUNCTION LPAREN STAR RPAREN
             root_0 = this.adaptor.nil();
 
-            FUNCTION524=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10635); if (this.state.failed) return retval;
+            FUNCTION511=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10683); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION524_tree = this.adaptor.create(FUNCTION524);
-            this.adaptor.addChild(root_0, FUNCTION524_tree);
+            FUNCTION511_tree = this.adaptor.create(FUNCTION511);
+            this.adaptor.addChild(root_0, FUNCTION511_tree);
             }
-            LPAREN525=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10637); if (this.state.failed) return retval;
+            LPAREN512=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10685); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN525_tree = this.adaptor.create(LPAREN525);
-            this.adaptor.addChild(root_0, LPAREN525_tree);
+            LPAREN512_tree = this.adaptor.create(LPAREN512);
+            this.adaptor.addChild(root_0, LPAREN512_tree);
             }
-            STAR526=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10639); if (this.state.failed) return retval;
+            STAR513=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10687); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            STAR526_tree = this.adaptor.create(STAR526);
-            this.adaptor.addChild(root_0, STAR526_tree);
+            STAR513_tree = this.adaptor.create(STAR513);
+            this.adaptor.addChild(root_0, STAR513_tree);
             }
-            RPAREN527=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10641); if (this.state.failed) return retval;
+            RPAREN514=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10689); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN527_tree = this.adaptor.create(RPAREN527);
-            this.adaptor.addChild(root_0, RPAREN527_tree);
+            RPAREN514_tree = this.adaptor.create(RPAREN514);
+            this.adaptor.addChild(root_0, RPAREN514_tree);
             }
 
 
@@ -42535,7 +42580,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1443:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
+    // xquery/XQueryParser.g:1445:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
     // $ANTLR start "p_TypedFunctionTest"
     p_TypedFunctionTest: function() {
         var retval = new XQueryParser.p_TypedFunctionTest_return();
@@ -42543,37 +42588,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION528 = null;
-        var LPAREN529 = null;
-        var COMMA531 = null;
-        var RPAREN533 = null;
-        var AS534 = null;
-         var p_SequenceType530 = null;
-         var p_SequenceType532 = null;
-         var p_SequenceType535 = null;
+        var FUNCTION515 = null;
+        var LPAREN516 = null;
+        var COMMA518 = null;
+        var RPAREN520 = null;
+        var AS521 = null;
+         var p_SequenceType517 = null;
+         var p_SequenceType519 = null;
+         var p_SequenceType522 = null;
 
-        var FUNCTION528_tree=null;
-        var LPAREN529_tree=null;
-        var COMMA531_tree=null;
-        var RPAREN533_tree=null;
-        var AS534_tree=null;
+        var FUNCTION515_tree=null;
+        var LPAREN516_tree=null;
+        var COMMA518_tree=null;
+        var RPAREN520_tree=null;
+        var AS521_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1444:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
-            // xquery/XQueryParser.g:1444:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
+            // xquery/XQueryParser.g:1446:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
+            // xquery/XQueryParser.g:1446:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
             root_0 = this.adaptor.nil();
 
-            FUNCTION528=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10667); if (this.state.failed) return retval;
+            FUNCTION515=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10715); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION528_tree = this.adaptor.create(FUNCTION528);
-            this.adaptor.addChild(root_0, FUNCTION528_tree);
+            FUNCTION515_tree = this.adaptor.create(FUNCTION515);
+            this.adaptor.addChild(root_0, FUNCTION515_tree);
             }
-            LPAREN529=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10669); if (this.state.failed) return retval;
+            LPAREN516=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10717); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN529_tree = this.adaptor.create(LPAREN529);
-            this.adaptor.addChild(root_0, LPAREN529_tree);
+            LPAREN516_tree = this.adaptor.create(LPAREN516);
+            this.adaptor.addChild(root_0, LPAREN516_tree);
             }
-            // xquery/XQueryParser.g:1444:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
+            // xquery/XQueryParser.g:1446:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
             var alt178=2;
             var LA178_0 = this.input.LA(1);
 
@@ -42582,14 +42627,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt178) {
                 case 1 :
-                    // xquery/XQueryParser.g:1444:28: p_SequenceType ( COMMA p_SequenceType )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672);
-                    p_SequenceType530=this.p_SequenceType();
+                    // xquery/XQueryParser.g:1446:28: p_SequenceType ( COMMA p_SequenceType )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720);
+                    p_SequenceType517=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType530.getTree());
-                    // xquery/XQueryParser.g:1444:43: ( COMMA p_SequenceType )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType517.getTree());
+                    // xquery/XQueryParser.g:1446:43: ( COMMA p_SequenceType )*
                     loop177:
                     do {
                         var alt177=2;
@@ -42602,18 +42647,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt177) {
                         case 1 :
-                            // xquery/XQueryParser.g:1444:44: COMMA p_SequenceType
-                            COMMA531=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10675); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1446:44: COMMA p_SequenceType
+                            COMMA518=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10723); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA531_tree = this.adaptor.create(COMMA531);
-                            this.adaptor.addChild(root_0, COMMA531_tree);
+                            COMMA518_tree = this.adaptor.create(COMMA518);
+                            this.adaptor.addChild(root_0, COMMA518_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677);
-                            p_SequenceType532=this.p_SequenceType();
+                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725);
+                            p_SequenceType519=this.p_SequenceType();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType532.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType519.getTree());
 
 
                             break;
@@ -42629,22 +42674,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN533=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10683); if (this.state.failed) return retval;
+            RPAREN520=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10731); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN533_tree = this.adaptor.create(RPAREN533);
-            this.adaptor.addChild(root_0, RPAREN533_tree);
+            RPAREN520_tree = this.adaptor.create(RPAREN520);
+            this.adaptor.addChild(root_0, RPAREN520_tree);
             }
-            AS534=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10685); if (this.state.failed) return retval;
+            AS521=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            AS534_tree = this.adaptor.create(AS534);
-            this.adaptor.addChild(root_0, AS534_tree);
+            AS521_tree = this.adaptor.create(AS521);
+            this.adaptor.addChild(root_0, AS521_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687);
-            p_SequenceType535=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735);
+            p_SequenceType522=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType535.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType522.getTree());
 
 
 
@@ -42681,7 +42726,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1448:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
+    // xquery/XQueryParser.g:1450:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
     // $ANTLR start "p_ParenthesizedItemType"
     p_ParenthesizedItemType: function() {
         var retval = new XQueryParser.p_ParenthesizedItemType_return();
@@ -42689,33 +42734,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN536 = null;
-        var RPAREN538 = null;
-         var p_ItemType537 = null;
+        var LPAREN523 = null;
+        var RPAREN525 = null;
+         var p_ItemType524 = null;
 
-        var LPAREN536_tree=null;
-        var RPAREN538_tree=null;
+        var LPAREN523_tree=null;
+        var RPAREN525_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1449:9: ( LPAREN p_ItemType RPAREN )
-            // xquery/XQueryParser.g:1449:11: LPAREN p_ItemType RPAREN
+            // xquery/XQueryParser.g:1451:9: ( LPAREN p_ItemType RPAREN )
+            // xquery/XQueryParser.g:1451:11: LPAREN p_ItemType RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN536=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10713); if (this.state.failed) return retval;
+            LPAREN523=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10761); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN536_tree = this.adaptor.create(LPAREN536);
-            this.adaptor.addChild(root_0, LPAREN536_tree);
+            LPAREN523_tree = this.adaptor.create(LPAREN523);
+            this.adaptor.addChild(root_0, LPAREN523_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715);
-            p_ItemType537=this.p_ItemType();
+            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763);
+            p_ItemType524=this.p_ItemType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType537.getTree());
-            RPAREN538=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10717); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType524.getTree());
+            RPAREN525=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10765); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN538_tree = this.adaptor.create(RPAREN538);
-            this.adaptor.addChild(root_0, RPAREN538_tree);
+            RPAREN525_tree = this.adaptor.create(RPAREN525);
+            this.adaptor.addChild(root_0, RPAREN525_tree);
             }
 
 
@@ -42753,7 +42798,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1478:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
+    // xquery/XQueryParser.g:1480:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
     // $ANTLR start "p_StringLiteral"
     p_StringLiteral: function() {
         var retval = new XQueryParser.p_StringLiteral_return();
@@ -42761,23 +42806,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT539 = null;
-        var QUOT541 = null;
-        var APOS542 = null;
-        var APOS544 = null;
-         var pg_QuotStringLiteralContent540 = null;
-         var pg_AposStringLiteralContent543 = null;
+        var QUOT526 = null;
+        var QUOT528 = null;
+        var APOS529 = null;
+        var APOS531 = null;
+         var pg_QuotStringLiteralContent527 = null;
+         var pg_AposStringLiteralContent530 = null;
 
-        var QUOT539_tree=null;
-        var QUOT541_tree=null;
-        var APOS542_tree=null;
-        var APOS544_tree=null;
+        var QUOT526_tree=null;
+        var QUOT528_tree=null;
+        var APOS529_tree=null;
+        var APOS531_tree=null;
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token QUOT");
         var stream_pg_QuotStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_QuotStringLiteralContent");
         var stream_pg_AposStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_AposStringLiteralContent");
         try {
-            // xquery/XQueryParser.g:1479:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
+            // xquery/XQueryParser.g:1481:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
             var alt179=2;
             var LA179_0 = this.input.LA(1);
 
@@ -42796,21 +42841,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt179) {
                 case 1 :
-                    // xquery/XQueryParser.g:1479:11: QUOT pg_QuotStringLiteralContent QUOT
-                    QUOT539=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10768); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT539);
+                    // xquery/XQueryParser.g:1481:11: QUOT pg_QuotStringLiteralContent QUOT
+                    QUOT526=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10816); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT526);
 
                     if ( this.state.backtracking===0 ) {
                        this.pushStringLexer(false);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772);
-                    pg_QuotStringLiteralContent540=this.pg_QuotStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820);
+                    pg_QuotStringLiteralContent527=this.pg_QuotStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent540.getTree());
-                    QUOT541=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10774); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT541);
+                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent527.getTree());
+                    QUOT528=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10822); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT528);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -42828,14 +42873,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1480:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                    // 1482:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1480:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1480:36: ( pg_QuotStringLiteralContent )*
+                        // xquery/XQueryParser.g:1482:36: ( pg_QuotStringLiteralContent )*
                         while ( stream_pg_QuotStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_QuotStringLiteralContent.nextTree());
 
@@ -42851,21 +42896,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1481:11: APOS pg_AposStringLiteralContent APOS
-                    APOS542=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10813); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS542);
+                    // xquery/XQueryParser.g:1483:11: APOS pg_AposStringLiteralContent APOS
+                    APOS529=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10861); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS529);
 
                     if ( this.state.backtracking===0 ) {
                       this.pushStringLexer(true);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817);
-                    pg_AposStringLiteralContent543=this.pg_AposStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865);
+                    pg_AposStringLiteralContent530=this.pg_AposStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent543.getTree());
-                    APOS544=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10819); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS544);
+                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent530.getTree());
+                    APOS531=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10867); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS531);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -42883,14 +42928,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1482:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                    // 1484:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1484:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1482:36: ( pg_AposStringLiteralContent )*
+                        // xquery/XQueryParser.g:1484:36: ( pg_AposStringLiteralContent )*
                         while ( stream_pg_AposStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_AposStringLiteralContent.nextTree());
 
@@ -42941,7 +42986,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1488:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
+    // xquery/XQueryParser.g:1490:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
     // $ANTLR start "pg_QuotStringLiteralContent"
     pg_QuotStringLiteralContent: function() {
         var retval = new XQueryParser.pg_QuotStringLiteralContent_return();
@@ -42949,16 +42994,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set545 = null;
+        var set532 = null;
 
-        var set545_tree=null;
+        var set532_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1489:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             loop180:
             do {
                 var alt180=2;
@@ -42972,10 +43017,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt180) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set545=this.input.LT(1);
+                    set532=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=APOS)||(this.input.LA(1)>=NCNameStartChar && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set545));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set532));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -43029,7 +43074,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1496:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
+    // xquery/XQueryParser.g:1498:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
     // $ANTLR start "pg_AposStringLiteralContent"
     pg_AposStringLiteralContent: function() {
         var retval = new XQueryParser.pg_AposStringLiteralContent_return();
@@ -43037,16 +43082,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set546 = null;
+        var set533 = null;
 
-        var set546_tree=null;
+        var set533_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1497:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             loop181:
             do {
                 var alt181=2;
@@ -43060,10 +43105,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt181) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set546=this.input.LT(1);
+                    set533=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=CHARREF_HEX)||(this.input.LA(1)>=QUOT && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set546));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set533));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -43117,7 +43162,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1511:1: p_ElementContentChar : L_ElementContentChar ;
+    // xquery/XQueryParser.g:1513:1: p_ElementContentChar : L_ElementContentChar ;
     // $ANTLR start "p_ElementContentChar"
     p_ElementContentChar: function() {
         var retval = new XQueryParser.p_ElementContentChar_return();
@@ -43125,19 +43170,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_ElementContentChar547 = null;
+        var L_ElementContentChar534 = null;
 
-        var L_ElementContentChar547_tree=null;
+        var L_ElementContentChar534_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1512:9: ( L_ElementContentChar )
-            // xquery/XQueryParser.g:1512:11: L_ElementContentChar
+            // xquery/XQueryParser.g:1514:9: ( L_ElementContentChar )
+            // xquery/XQueryParser.g:1514:11: L_ElementContentChar
             root_0 = this.adaptor.nil();
 
-            L_ElementContentChar547=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994); if (this.state.failed) return retval;
+            L_ElementContentChar534=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_ElementContentChar547_tree = this.adaptor.create(L_ElementContentChar547);
-            this.adaptor.addChild(root_0, L_ElementContentChar547_tree);
+            L_ElementContentChar534_tree = this.adaptor.create(L_ElementContentChar534);
+            this.adaptor.addChild(root_0, L_ElementContentChar534_tree);
             }
 
 
@@ -43175,7 +43220,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1516:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
+    // xquery/XQueryParser.g:1518:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
     // $ANTLR start "p_QuotAttrContentChar"
     p_QuotAttrContentChar: function() {
         var retval = new XQueryParser.p_QuotAttrContentChar_return();
@@ -43183,16 +43228,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_QuotAttrContentChar548 = null;
+        var L_QuotAttrContentChar535 = null;
 
-        var L_QuotAttrContentChar548_tree=null;
+        var L_QuotAttrContentChar535_tree=null;
         var stream_L_QuotAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_QuotAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1517:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
-            // xquery/XQueryParser.g:1517:11: L_QuotAttrContentChar
-            L_QuotAttrContentChar548=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar548);
+            // xquery/XQueryParser.g:1519:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
+            // xquery/XQueryParser.g:1519:11: L_QuotAttrContentChar
+            L_QuotAttrContentChar535=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar535);
 
 
 
@@ -43207,9 +43252,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1518:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
+            // 1520:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
             {
-                // xquery/XQueryParser.g:1518:20: ^( AttributeValueChar L_QuotAttrContentChar )
+                // xquery/XQueryParser.g:1520:20: ^( AttributeValueChar L_QuotAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -43257,7 +43302,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1522:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
+    // xquery/XQueryParser.g:1524:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
     // $ANTLR start "p_AposAttrContentChar"
     p_AposAttrContentChar: function() {
         var retval = new XQueryParser.p_AposAttrContentChar_return();
@@ -43265,16 +43310,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_AposAttrContentChar549 = null;
+        var L_AposAttrContentChar536 = null;
 
-        var L_AposAttrContentChar549_tree=null;
+        var L_AposAttrContentChar536_tree=null;
         var stream_L_AposAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_AposAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1523:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
-            // xquery/XQueryParser.g:1523:11: L_AposAttrContentChar
-            L_AposAttrContentChar549=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar549);
+            // xquery/XQueryParser.g:1525:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
+            // xquery/XQueryParser.g:1525:11: L_AposAttrContentChar
+            L_AposAttrContentChar536=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar536);
 
 
 
@@ -43289,9 +43334,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1524:17: -> ^( AttributeValueChar L_AposAttrContentChar )
+            // 1526:17: -> ^( AttributeValueChar L_AposAttrContentChar )
             {
-                // xquery/XQueryParser.g:1524:20: ^( AttributeValueChar L_AposAttrContentChar )
+                // xquery/XQueryParser.g:1526:20: ^( AttributeValueChar L_AposAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -43339,7 +43384,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1542:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
+    // xquery/XQueryParser.g:1544:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
     // $ANTLR start "p_QName"
     p_QName: function() {
         var retval = new XQueryParser.p_QName_return();
@@ -43347,13 +43392,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName550 = null;
-         var p_NCName551 = null;
+         var pg_QName537 = null;
+         var p_NCName538 = null;
 
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:1544:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
+            // xquery/XQueryParser.g:1546:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
             var alt182=2;
             var LA182_0 = this.input.LA(1);
 
@@ -43383,26 +43428,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt182) {
                 case 1 :
-                    // xquery/XQueryParser.g:1544:11: pg_QName
+                    // xquery/XQueryParser.g:1546:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11156);
-                    pg_QName550=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11204);
+                    pg_QName537=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName550.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName537.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1545:11: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11168);
-                    p_NCName551=this.p_NCName();
+                    // xquery/XQueryParser.g:1547:11: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11216);
+                    p_NCName538=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName551.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName538.getTree());
 
 
                     // AST REWRITE
@@ -43416,9 +43461,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1546:17: -> ^( QName p_NCName )
+                    // 1548:17: -> ^( QName p_NCName )
                     {
-                        // xquery/XQueryParser.g:1546:20: ^( QName p_NCName )
+                        // xquery/XQueryParser.g:1548:20: ^( QName p_NCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43469,7 +43514,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1550:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
+    // xquery/XQueryParser.g:1552:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
     // $ANTLR start "pg_FQName"
     pg_FQName: function() {
         var retval = new XQueryParser.pg_FQName_return();
@@ -43477,12 +43522,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName552 = null;
-         var p_FNCName553 = null;
+         var pg_QName539 = null;
+         var p_FNCName540 = null;
 
         var stream_p_FNCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_FNCName");
         try {
-            // xquery/XQueryParser.g:1551:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
+            // xquery/XQueryParser.g:1553:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
             var alt183=2;
             switch ( this.input.LA(1) ) {
             case ANCESTOR:
@@ -43721,26 +43766,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt183) {
                 case 1 :
-                    // xquery/XQueryParser.g:1551:11: pg_QName
+                    // xquery/XQueryParser.g:1553:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11229);
-                    pg_QName552=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11277);
+                    pg_QName539=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName552.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName539.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1552:11: p_FNCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11241);
-                    p_FNCName553=this.p_FNCName();
+                    // xquery/XQueryParser.g:1554:11: p_FNCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11289);
+                    p_FNCName540=this.p_FNCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName553.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName540.getTree());
 
 
                     // AST REWRITE
@@ -43754,9 +43799,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1553:17: -> ^( QName p_FNCName )
+                    // 1555:17: -> ^( QName p_FNCName )
                     {
-                        // xquery/XQueryParser.g:1553:20: ^( QName p_FNCName )
+                        // xquery/XQueryParser.g:1555:20: ^( QName p_FNCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43806,7 +43851,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1555:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
+    // xquery/XQueryParser.g:1557:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
     // $ANTLR start "pg_QName"
     pg_QName: function() {
         var retval = new XQueryParser.pg_QName_return();
@@ -43814,26 +43859,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COLON554 = null;
+        var COLON541 = null;
          var nn = null;
          var nl = null;
 
-        var COLON554_tree=null;
+        var COLON541_tree=null;
         var stream_COLON=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COLON");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:1556:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
-            // xquery/XQueryParser.g:1556:11: nn= p_NCName COLON nl= p_NCName
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11285);
+            // xquery/XQueryParser.g:1558:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
+            // xquery/XQueryParser.g:1558:11: nn= p_NCName COLON nl= p_NCName
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11333);
             nn=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_NCName.add(nn.getTree());
-            COLON554=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11287); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_COLON.add(COLON554);
+            COLON541=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11335); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_COLON.add(COLON541);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11291);
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11339);
             nl=this.p_NCName();
 
             this.state._fsp--;
@@ -43842,7 +43887,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nl, nn
+            // elements: nn, nl
             // token labels: 
             // rule labels: retval, nn, nl
             // token list labels: 
@@ -43854,9 +43899,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_nl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nl",nl!=null?nl.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1557:17: -> ^( QName $nn $nl)
+            // 1559:17: -> ^( QName $nn $nl)
             {
-                // xquery/XQueryParser.g:1557:20: ^( QName $nn $nl)
+                // xquery/XQueryParser.g:1559:20: ^( QName $nn $nl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -43905,7 +43950,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1587:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1589:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_NCName"
     p_NCName: function() {
         var retval = new XQueryParser.p_NCName_return();
@@ -43913,19 +43958,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set555 = null;
+        var set542 = null;
 
-        var set555_tree=null;
+        var set542_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1588:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1590:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set555=this.input.LT(1);
+            set542=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=SKIP)||(this.input.LA(1)>=VALUE && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set555));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set542));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -43970,7 +44015,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1606:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1608:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_FNCName"
     p_FNCName: function() {
         var retval = new XQueryParser.p_FNCName_return();
@@ -43978,19 +44023,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set556 = null;
+        var set543 = null;
 
-        var set556_tree=null;
+        var set543_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1607:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1609:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set556=this.input.LT(1);
+            set543=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=AT)||(this.input.LA(1)>=BASE_URI && this.input.LA(1)<=COLLATION)||(this.input.LA(1)>=CONSTRUCTION && this.input.LA(1)<=DOCUMENT)||(this.input.LA(1)>=ELSE && this.input.LA(1)<=EMPTY)||(this.input.LA(1)>=ENCODING && this.input.LA(1)<=IDIV)||(this.input.LA(1)>=IMPORT && this.input.LA(1)<=IS)||(this.input.LA(1)>=LAX && this.input.LA(1)<=NO_PRESERVE)||(this.input.LA(1)>=OF && this.input.LA(1)<=PRESERVE)||(this.input.LA(1)>=RETURN && this.input.LA(1)<=SCHEMA)||(this.input.LA(1)>=SELF && this.input.LA(1)<=STRIP)||(this.input.LA(1)>=THEN && this.input.LA(1)<=TREAT)||(this.input.LA(1)>=UNION && this.input.LA(1)<=MINUS_SIGN)||(this.input.LA(1)>=NAN && this.input.LA(1)<=START)||(this.input.LA(1)>=TRY && this.input.LA(1)<=RETURNING)||(this.input.LA(1)>=CHECK && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set556));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set543));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -44035,7 +44080,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1644:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
+    // xquery/XQueryParser.g:1646:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
     // $ANTLR start "pg_UpdateExpr"
     pg_UpdateExpr: function() {
         var retval = new XQueryParser.pg_UpdateExpr_return();
@@ -44043,15 +44088,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InsertExpr557 = null;
-         var p_DeleteExpr558 = null;
-         var p_RenameExpr559 = null;
-         var p_ReplaceExpr560 = null;
-         var p_TransformExpr561 = null;
+         var p_InsertExpr544 = null;
+         var p_DeleteExpr545 = null;
+         var p_RenameExpr546 = null;
+         var p_ReplaceExpr547 = null;
+         var p_TransformExpr548 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1645:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
+            // xquery/XQueryParser.g:1647:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
             var alt184=5;
             switch ( this.input.LA(1) ) {
             case INSERT:
@@ -44079,67 +44124,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt184) {
                 case 1 :
-                    // xquery/XQueryParser.g:1645:11: p_InsertExpr
+                    // xquery/XQueryParser.g:1647:11: p_InsertExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282);
-                    p_InsertExpr557=this.p_InsertExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330);
+                    p_InsertExpr544=this.p_InsertExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr557.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr544.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1646:11: p_DeleteExpr
+                    // xquery/XQueryParser.g:1648:11: p_DeleteExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294);
-                    p_DeleteExpr558=this.p_DeleteExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342);
+                    p_DeleteExpr545=this.p_DeleteExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr558.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr545.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1647:11: p_RenameExpr
+                    // xquery/XQueryParser.g:1649:11: p_RenameExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306);
-                    p_RenameExpr559=this.p_RenameExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354);
+                    p_RenameExpr546=this.p_RenameExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr559.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr546.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1648:11: p_ReplaceExpr
+                    // xquery/XQueryParser.g:1650:11: p_ReplaceExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318);
-                    p_ReplaceExpr560=this.p_ReplaceExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366);
+                    p_ReplaceExpr547=this.p_ReplaceExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr560.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr547.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1649:11: p_TransformExpr
+                    // xquery/XQueryParser.g:1651:11: p_TransformExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330);
-                    p_TransformExpr561=this.p_TransformExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378);
+                    p_TransformExpr548=this.p_TransformExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr561.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr548.getTree());
 
 
                     break;
@@ -44178,7 +44223,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1653:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
+    // xquery/XQueryParser.g:1655:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
     // $ANTLR start "pm_RevalidationDecl"
     pm_RevalidationDecl: function() {
         var retval = new XQueryParser.pm_RevalidationDecl_return();
@@ -44186,19 +44231,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON562 = null;
+        var SEMICOLON549 = null;
         var k = null;
         var list_k=null;
 
-        var SEMICOLON562_tree=null;
+        var SEMICOLON549_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1654:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
-            // xquery/XQueryParser.g:1654:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
+            // xquery/XQueryParser.g:1656:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
+            // xquery/XQueryParser.g:1656:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13358); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13406); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44206,7 +44251,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362); if (this.state.failed) return retval;
+            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44214,7 +44259,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1654:38: (k+= STRICT | k+= LAX | k+= SKIP )
+            // xquery/XQueryParser.g:1656:38: (k+= STRICT | k+= LAX | k+= SKIP )
             var alt185=3;
             switch ( this.input.LA(1) ) {
             case STRICT:
@@ -44236,8 +44281,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt185) {
                 case 1 :
-                    // xquery/XQueryParser.g:1654:39: k+= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:39: k+= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44249,8 +44294,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1654:51: k+= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13373); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:51: k+= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13421); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44262,8 +44307,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1654:60: k+= SKIP
-                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13379); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:60: k+= SKIP
+                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13427); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44280,10 +44325,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            SEMICOLON562=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384); if (this.state.failed) return retval;
+            SEMICOLON549=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON562_tree = this.adaptor.create(SEMICOLON562);
-            this.adaptor.addChild(root_0, SEMICOLON562_tree);
+            SEMICOLON549_tree = this.adaptor.create(SEMICOLON549);
+            this.adaptor.addChild(root_0, SEMICOLON549_tree);
             }
 
 
@@ -44321,7 +44366,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1658:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
+    // xquery/XQueryParser.g:1660:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
     // $ANTLR start "p_InsertExprTargetChoice"
     p_InsertExprTargetChoice: function() {
         var retval = new XQueryParser.p_InsertExprTargetChoice_return();
@@ -44339,7 +44384,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1659:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
+            // xquery/XQueryParser.g:1661:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
             var alt188=3;
             switch ( this.input.LA(1) ) {
             case AS:
@@ -44362,12 +44407,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt188) {
                 case 1 :
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )?
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )?
                     var alt187=2;
                     var LA187_0 = this.input.LA(1);
 
@@ -44376,8 +44421,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt187) {
                         case 1 :
-                            // xquery/XQueryParser.g:1659:13: k+= AS (k+= FIRST | k+= LAST )
-                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13414); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1661:13: k+= AS (k+= FIRST | k+= LAST )
+                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13462); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -44385,7 +44430,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if (org.antlr.lang.isNull(list_k)) list_k = [];
                             list_k.push(k);
 
-                            // xquery/XQueryParser.g:1659:19: (k+= FIRST | k+= LAST )
+                            // xquery/XQueryParser.g:1661:19: (k+= FIRST | k+= LAST )
                             var alt186=2;
                             var LA186_0 = this.input.LA(1);
 
@@ -44404,8 +44449,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt186) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1659:20: k+= FIRST
-                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13419); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:20: k+= FIRST
+                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13467); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -44417,8 +44462,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:1659:31: k+= LAST
-                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13425); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:31: k+= LAST
+                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13473); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -44438,7 +44483,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13432); if (this.state.failed) return retval;
+                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44456,10 +44501,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1660:11: ka= AFTER
+                    // xquery/XQueryParser.g:1662:11: ka= AFTER
                     root_0 = this.adaptor.nil();
 
-                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13449); if (this.state.failed) return retval;
+                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13497); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -44471,10 +44516,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1661:11: kb= BEFORE
+                    // xquery/XQueryParser.g:1663:11: kb= BEFORE
                     root_0 = this.adaptor.nil();
 
-                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465); if (this.state.failed) return retval;
+                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kb_tree = this.adaptor.create(kb);
                     this.adaptor.addChild(root_0, kb_tree);
@@ -44520,7 +44565,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1665:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
+    // xquery/XQueryParser.g:1667:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
     // $ANTLR start "p_InsertExpr"
     p_InsertExpr: function() {
         var retval = new XQueryParser.p_InsertExpr_return();
@@ -44530,18 +44575,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_SourceExpr563 = null;
-         var p_InsertExprTargetChoice564 = null;
-         var p_TargetExpr565 = null;
+         var p_SourceExpr550 = null;
+         var p_InsertExprTargetChoice551 = null;
+         var p_TargetExpr552 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1666:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
-            // xquery/XQueryParser.g:1666:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
+            // xquery/XQueryParser.g:1668:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
+            // xquery/XQueryParser.g:1668:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13495); if (this.state.failed) return retval;
+            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13543); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44549,7 +44594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1666:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1668:21: (k+= NODE | k+= NODES )
             var alt189=2;
             var LA189_0 = this.input.LA(1);
 
@@ -44568,8 +44613,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt189) {
                 case 1 :
-                    // xquery/XQueryParser.g:1666:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13500); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44581,8 +44626,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1666:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13506); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13554); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44596,24 +44641,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13509);
-            p_SourceExpr563=this.p_SourceExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13557);
+            p_SourceExpr550=this.p_SourceExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr563.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511);
-            p_InsertExprTargetChoice564=this.p_InsertExprTargetChoice();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr550.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559);
+            p_InsertExprTargetChoice551=this.p_InsertExprTargetChoice();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice564.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13513);
-            p_TargetExpr565=this.p_TargetExpr();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice551.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13561);
+            p_TargetExpr552=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr565.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr552.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44653,7 +44698,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1670:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
+    // xquery/XQueryParser.g:1672:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
     // $ANTLR start "p_DeleteExpr"
     p_DeleteExpr: function() {
         var retval = new XQueryParser.p_DeleteExpr_return();
@@ -44663,16 +44708,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr566 = null;
+         var p_TargetExpr553 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1671:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
-            // xquery/XQueryParser.g:1671:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
+            // xquery/XQueryParser.g:1673:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
+            // xquery/XQueryParser.g:1673:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13543); if (this.state.failed) return retval;
+            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13591); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44680,7 +44725,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1671:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1673:21: (k+= NODE | k+= NODES )
             var alt190=2;
             var LA190_0 = this.input.LA(1);
 
@@ -44699,8 +44744,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt190) {
                 case 1 :
-                    // xquery/XQueryParser.g:1671:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13596); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44712,8 +44757,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1671:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13554); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44727,12 +44772,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13557);
-            p_TargetExpr566=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13605);
+            p_TargetExpr553=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr566.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr553.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44772,7 +44817,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1675:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1677:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
     // $ANTLR start "p_ReplaceExpr"
     p_ReplaceExpr: function() {
         var retval = new XQueryParser.p_ReplaceExpr_return();
@@ -44782,17 +44827,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_ExprSingle567 = null;
-         var p_ExprSingle568 = null;
+         var p_ExprSingle554 = null;
+         var p_ExprSingle555 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1676:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1676:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
+            // xquery/XQueryParser.g:1678:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1678:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13587); if (this.state.failed) return retval;
+            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13635); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44800,7 +44845,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1676:22: (k+= VALUE k+= OF )?
+            // xquery/XQueryParser.g:1678:22: (k+= VALUE k+= OF )?
             var alt191=2;
             var LA191_0 = this.input.LA(1);
 
@@ -44809,8 +44854,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt191) {
                 case 1 :
-                    // xquery/XQueryParser.g:1676:23: k+= VALUE k+= OF
-                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13592); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1678:23: k+= VALUE k+= OF
+                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13640); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44818,7 +44863,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13596); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13644); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -44832,7 +44877,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13602); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44840,13 +44885,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604);
-            p_ExprSingle567=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652);
+            p_ExprSingle554=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
-            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13609); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle554.getTree());
+            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44854,12 +44899,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611);
-            p_ExprSingle568=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659);
+            p_ExprSingle555=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle568.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle555.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44899,7 +44944,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1680:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
+    // xquery/XQueryParser.g:1682:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
     // $ANTLR start "p_RenameExpr"
     p_RenameExpr: function() {
         var retval = new XQueryParser.p_RenameExpr_return();
@@ -44909,17 +44954,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr569 = null;
-         var p_NewNameExpr570 = null;
+         var p_TargetExpr556 = null;
+         var p_NewNameExpr557 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1681:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
-            // xquery/XQueryParser.g:1681:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
+            // xquery/XQueryParser.g:1683:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
+            // xquery/XQueryParser.g:1683:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13642); if (this.state.failed) return retval;
+            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13690); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44927,7 +44972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13646); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13694); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44935,13 +44980,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13648);
-            p_TargetExpr569=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13696);
+            p_TargetExpr556=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr569.getTree());
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13652); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr556.getTree());
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -44949,12 +44994,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13654);
-            p_NewNameExpr570=this.p_NewNameExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13702);
+            p_NewNameExpr557=this.p_NewNameExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr570.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr557.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -44994,7 +45039,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1685:1: p_SourceExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1687:1: p_SourceExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_SourceExpr"
     p_SourceExpr: function() {
         var retval = new XQueryParser.p_SourceExpr_return();
@@ -45002,20 +45047,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle571 = null;
+         var p_ExprSingle558 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1686:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1686:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1688:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1688:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13682);
-            p_ExprSingle571=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13730);
+            p_ExprSingle558=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle571.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle558.getTree());
 
 
 
@@ -45052,7 +45097,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1690:1: p_TargetExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1692:1: p_TargetExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_TargetExpr"
     p_TargetExpr: function() {
         var retval = new XQueryParser.p_TargetExpr_return();
@@ -45060,20 +45105,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle572 = null;
+         var p_ExprSingle559 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1691:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1691:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1693:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1693:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13709);
-            p_ExprSingle572=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13757);
+            p_ExprSingle559=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle572.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle559.getTree());
 
 
 
@@ -45110,7 +45155,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1695:1: p_NewNameExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1697:1: p_NewNameExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_NewNameExpr"
     p_NewNameExpr: function() {
         var retval = new XQueryParser.p_NewNameExpr_return();
@@ -45118,20 +45163,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle573 = null;
+         var p_ExprSingle560 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1696:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1696:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1698:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1698:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13736);
-            p_ExprSingle573=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13784);
+            p_ExprSingle560=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle573.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle560.getTree());
 
 
 
@@ -45168,7 +45213,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1700:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1702:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
     // $ANTLR start "p_TransformExpr"
     p_TransformExpr: function() {
         var retval = new XQueryParser.p_TransformExpr_return();
@@ -45178,31 +45223,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var e = null;
-        var BIND574 = null;
-        var COMMA576 = null;
-        var BIND577 = null;
+        var BIND561 = null;
+        var COMMA563 = null;
+        var BIND564 = null;
         var k = null;
         var list_k=null;
          var v = null;
          var w = null;
-         var p_ExprSingle575 = null;
-         var p_ExprSingle578 = null;
-         var p_ExprSingle579 = null;
-         var p_ExprSingle580 = null;
+         var p_ExprSingle562 = null;
+         var p_ExprSingle565 = null;
+         var p_ExprSingle566 = null;
+         var p_ExprSingle567 = null;
 
         var d_tree=null;
         var e_tree=null;
-        var BIND574_tree=null;
-        var COMMA576_tree=null;
-        var BIND577_tree=null;
+        var BIND561_tree=null;
+        var COMMA563_tree=null;
+        var BIND564_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1701:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1701:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
+            // xquery/XQueryParser.g:1703:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1703:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13765); if (this.state.failed) return retval;
+            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13813); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45210,12 +45255,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13769); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13817); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13773);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13821);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -45224,18 +45269,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND574=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13777); if (this.state.failed) return retval;
+            BIND561=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13825); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND574_tree = this.adaptor.create(BIND574);
-            this.adaptor.addChild(root_0, BIND574_tree);
+            BIND561_tree = this.adaptor.create(BIND561);
+            this.adaptor.addChild(root_0, BIND561_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13779);
-            p_ExprSingle575=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13827);
+            p_ExprSingle562=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle575.getTree());
-            // xquery/XQueryParser.g:1701:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle562.getTree());
+            // xquery/XQueryParser.g:1703:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
             loop192:
             do {
                 var alt192=2;
@@ -45248,18 +45293,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt192) {
                 case 1 :
-                    // xquery/XQueryParser.g:1701:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
-                    COMMA576=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13783); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1703:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
+                    COMMA563=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13831); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA576_tree = this.adaptor.create(COMMA576);
-                    this.adaptor.addChild(root_0, COMMA576_tree);
+                    COMMA563_tree = this.adaptor.create(COMMA563);
+                    this.adaptor.addChild(root_0, COMMA563_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13787); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13835); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13791);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13839);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -45268,17 +45313,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    BIND577=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13795); if (this.state.failed) return retval;
+                    BIND564=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13843); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND577_tree = this.adaptor.create(BIND577);
-                    this.adaptor.addChild(root_0, BIND577_tree);
+                    BIND564_tree = this.adaptor.create(BIND564);
+                    this.adaptor.addChild(root_0, BIND564_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13797);
-                    p_ExprSingle578=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13845);
+                    p_ExprSingle565=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle578.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle565.getTree());
 
 
                     break;
@@ -45288,7 +45333,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13804); if (this.state.failed) return retval;
+            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13852); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45296,13 +45341,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13806);
-            p_ExprSingle579=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13854);
+            p_ExprSingle566=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle579.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13811); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle566.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13859); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45310,12 +45355,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13813);
-            p_ExprSingle580=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13861);
+            p_ExprSingle567=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle580.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -45355,7 +45400,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1711:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
+    // xquery/XQueryParser.g:1713:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
     // $ANTLR start "pm_FTOptionDecl"
     pm_FTOptionDecl: function() {
         var retval = new XQueryParser.pm_FTOptionDecl_return();
@@ -45363,20 +45408,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON582 = null;
+        var SEMICOLON569 = null;
         var k = null;
         var list_k=null;
-         var p_FTMatchOptions581 = null;
+         var p_FTMatchOptions568 = null;
 
-        var SEMICOLON582_tree=null;
+        var SEMICOLON569_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1712:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
-            // xquery/XQueryParser.g:1712:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
+            // xquery/XQueryParser.g:1714:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
+            // xquery/XQueryParser.g:1714:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13851); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13899); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45384,7 +45429,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855); if (this.state.failed) return retval;
+            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -45392,16 +45437,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857);
-            p_FTMatchOptions581=this.p_FTMatchOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905);
+            p_FTMatchOptions568=this.p_FTMatchOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions581.getTree());
-            SEMICOLON582=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions568.getTree());
+            SEMICOLON569=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON582_tree = this.adaptor.create(SEMICOLON582);
-            this.adaptor.addChild(root_0, SEMICOLON582_tree);
+            SEMICOLON569_tree = this.adaptor.create(SEMICOLON569);
+            this.adaptor.addChild(root_0, SEMICOLON569_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
@@ -45442,7 +45487,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1716:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1718:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_FTScoreVar"
     p_FTScoreVar: function() {
         var retval = new XQueryParser.p_FTScoreVar_return();
@@ -45458,11 +45503,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1717:9: (ks= SCORE d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1717:11: ks= SCORE d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1719:9: (ks= SCORE d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1719:11: ks= SCORE d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13889); if (this.state.failed) return retval;
+            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ks_tree = this.adaptor.create(ks);
             this.adaptor.addChild(root_0, ks_tree);
@@ -45470,12 +45515,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ks);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13895); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13943); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13899);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13947);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -45520,7 +45565,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1721:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
+    // xquery/XQueryParser.g:1723:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
     // $ANTLR start "p_FTContainsExpr"
     p_FTContainsExpr: function() {
         var retval = new XQueryParser.p_FTContainsExpr_return();
@@ -45530,24 +45575,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringConcatExpr583 = null;
-         var p_FTSelection584 = null;
-         var p_FTIgnoreOption585 = null;
+         var p_StringConcatExpr570 = null;
+         var p_FTSelection571 = null;
+         var p_FTIgnoreOption572 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1722:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
-            // xquery/XQueryParser.g:1722:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            // xquery/XQueryParser.g:1724:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
+            // xquery/XQueryParser.g:1724:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927);
-            p_StringConcatExpr583=this.p_StringConcatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975);
+            p_StringConcatExpr570=this.p_StringConcatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr583.getTree());
-            // xquery/XQueryParser.g:1722:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr570.getTree());
+            // xquery/XQueryParser.g:1724:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             var alt194=2;
             var LA194_0 = this.input.LA(1);
 
@@ -45556,8 +45601,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt194) {
                 case 1 :
-                    // xquery/XQueryParser.g:1722:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
-                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13933); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1724:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
+                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13981); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -45565,7 +45610,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13937); if (this.state.failed) return retval;
+                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -45576,13 +45621,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13941);
-                    p_FTSelection584=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13989);
+                    p_FTSelection571=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection584.getTree());
-                    // xquery/XQueryParser.g:1722:81: ( p_FTIgnoreOption )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection571.getTree());
+                    // xquery/XQueryParser.g:1724:81: ( p_FTIgnoreOption )?
                     var alt193=2;
                     var LA193_0 = this.input.LA(1);
 
@@ -45591,13 +45636,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt193) {
                         case 1 :
-                            // xquery/XQueryParser.g:1722:81: p_FTIgnoreOption
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943);
-                            p_FTIgnoreOption585=this.p_FTIgnoreOption();
+                            // xquery/XQueryParser.g:1724:81: p_FTIgnoreOption
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991);
+                            p_FTIgnoreOption572=this.p_FTIgnoreOption();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption585.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption572.getTree());
 
 
                             break;
@@ -45646,7 +45691,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1726:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
+    // xquery/XQueryParser.g:1728:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
     // $ANTLR start "p_FTSelection"
     p_FTSelection: function() {
         var retval = new XQueryParser.p_FTSelection_return();
@@ -45654,22 +45699,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOr586 = null;
-         var p_FTPosFilter587 = null;
+         var p_FTOr573 = null;
+         var p_FTPosFilter574 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1727:9: ( p_FTOr ( p_FTPosFilter )* )
-            // xquery/XQueryParser.g:1727:11: p_FTOr ( p_FTPosFilter )*
+            // xquery/XQueryParser.g:1729:9: ( p_FTOr ( p_FTPosFilter )* )
+            // xquery/XQueryParser.g:1729:11: p_FTOr ( p_FTPosFilter )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection13973);
-            p_FTOr586=this.p_FTOr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection14021);
+            p_FTOr573=this.p_FTOr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr586.getTree());
-            // xquery/XQueryParser.g:1727:18: ( p_FTPosFilter )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr573.getTree());
+            // xquery/XQueryParser.g:1729:18: ( p_FTPosFilter )*
             loop195:
             do {
                 var alt195=2;
@@ -45682,13 +45727,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt195) {
                 case 1 :
-                    // xquery/XQueryParser.g:1727:18: p_FTPosFilter
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection13975);
-                    p_FTPosFilter587=this.p_FTPosFilter();
+                    // xquery/XQueryParser.g:1729:18: p_FTPosFilter
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection14023);
+                    p_FTPosFilter574=this.p_FTPosFilter();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter587.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter574.getTree());
 
 
                     break;
@@ -45734,7 +45779,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1731:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1733:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_FTWeight"
     p_FTWeight: function() {
         var retval = new XQueryParser.p_FTWeight_return();
@@ -45743,20 +45788,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-        var LBRACKET588 = null;
-        var RBRACKET590 = null;
-         var p_Expr589 = null;
+        var LBRACKET575 = null;
+        var RBRACKET577 = null;
+         var p_Expr576 = null;
 
         var kw_tree=null;
-        var LBRACKET588_tree=null;
-        var RBRACKET590_tree=null;
+        var LBRACKET575_tree=null;
+        var RBRACKET577_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1732:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1732:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1734:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1734:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14004); if (this.state.failed) return retval;
+            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14052); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -45764,21 +45809,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            LBRACKET588=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14008); if (this.state.failed) return retval;
+            LBRACKET575=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14056); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET588_tree = this.adaptor.create(LBRACKET588);
-            this.adaptor.addChild(root_0, LBRACKET588_tree);
+            LBRACKET575_tree = this.adaptor.create(LBRACKET575);
+            this.adaptor.addChild(root_0, LBRACKET575_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14010);
-            p_Expr589=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14058);
+            p_Expr576=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr589.getTree());
-            RBRACKET590=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14013); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr576.getTree());
+            RBRACKET577=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14061); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET590_tree = this.adaptor.create(RBRACKET590);
-            this.adaptor.addChild(root_0, RBRACKET590_tree);
+            RBRACKET577_tree = this.adaptor.create(RBRACKET577);
+            this.adaptor.addChild(root_0, RBRACKET577_tree);
             }
 
 
@@ -45816,7 +45861,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1736:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
+    // xquery/XQueryParser.g:1738:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
     // $ANTLR start "p_FTOr"
     p_FTOr: function() {
         var retval = new XQueryParser.p_FTOr_return();
@@ -45825,23 +45870,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_FTAnd591 = null;
-         var p_FTAnd592 = null;
+         var p_FTAnd578 = null;
+         var p_FTAnd579 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1737:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
-            // xquery/XQueryParser.g:1737:11: p_FTAnd (ko= FTOR p_FTAnd )*
+            // xquery/XQueryParser.g:1739:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
+            // xquery/XQueryParser.g:1739:11: p_FTAnd (ko= FTOR p_FTAnd )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14039);
-            p_FTAnd591=this.p_FTAnd();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14087);
+            p_FTAnd578=this.p_FTAnd();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd591.getTree());
-            // xquery/XQueryParser.g:1737:19: (ko= FTOR p_FTAnd )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd578.getTree());
+            // xquery/XQueryParser.g:1739:19: (ko= FTOR p_FTAnd )*
             loop196:
             do {
                 var alt196=2;
@@ -45854,8 +45899,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt196) {
                 case 1 :
-                    // xquery/XQueryParser.g:1737:21: ko= FTOR p_FTAnd
-                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14045); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1739:21: ko= FTOR p_FTAnd
+                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14093); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ko_tree = this.adaptor.create(ko);
                     this.adaptor.addChild(root_0, ko_tree);
@@ -45863,12 +45908,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ko);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14049);
-                    p_FTAnd592=this.p_FTAnd();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14097);
+                    p_FTAnd579=this.p_FTAnd();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd592.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd579.getTree());
 
 
                     break;
@@ -45914,7 +45959,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1741:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
+    // xquery/XQueryParser.g:1743:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
     // $ANTLR start "p_FTAnd"
     p_FTAnd: function() {
         var retval = new XQueryParser.p_FTAnd_return();
@@ -45923,23 +45968,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-         var p_FTMildNot593 = null;
-         var p_FTMildNot594 = null;
+         var p_FTMildNot580 = null;
+         var p_FTMildNot581 = null;
 
         var ka_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1742:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
-            // xquery/XQueryParser.g:1742:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
+            // xquery/XQueryParser.g:1744:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
+            // xquery/XQueryParser.g:1744:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14078);
-            p_FTMildNot593=this.p_FTMildNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14126);
+            p_FTMildNot580=this.p_FTMildNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot593.getTree());
-            // xquery/XQueryParser.g:1742:23: (ka= FTAND p_FTMildNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot580.getTree());
+            // xquery/XQueryParser.g:1744:23: (ka= FTAND p_FTMildNot )*
             loop197:
             do {
                 var alt197=2;
@@ -45952,8 +45997,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt197) {
                 case 1 :
-                    // xquery/XQueryParser.g:1742:25: ka= FTAND p_FTMildNot
-                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1744:25: ka= FTAND p_FTMildNot
+                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14132); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -45961,12 +46006,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14088);
-                    p_FTMildNot594=this.p_FTMildNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14136);
+                    p_FTMildNot581=this.p_FTMildNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot594.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot581.getTree());
 
 
                     break;
@@ -46012,7 +46057,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1746:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
+    // xquery/XQueryParser.g:1748:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
     // $ANTLR start "p_FTMildNot"
     p_FTMildNot: function() {
         var retval = new XQueryParser.p_FTMildNot_return();
@@ -46022,23 +46067,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTUnaryNot595 = null;
-         var p_FTUnaryNot596 = null;
+         var p_FTUnaryNot582 = null;
+         var p_FTUnaryNot583 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1747:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
-            // xquery/XQueryParser.g:1747:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
+            // xquery/XQueryParser.g:1749:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
+            // xquery/XQueryParser.g:1749:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117);
-            p_FTUnaryNot595=this.p_FTUnaryNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165);
+            p_FTUnaryNot582=this.p_FTUnaryNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot595.getTree());
-            // xquery/XQueryParser.g:1747:24: (k+= NOT k+= IN p_FTUnaryNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot582.getTree());
+            // xquery/XQueryParser.g:1749:24: (k+= NOT k+= IN p_FTUnaryNot )*
             loop198:
             do {
                 var alt198=2;
@@ -46051,8 +46096,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt198) {
                 case 1 :
-                    // xquery/XQueryParser.g:1747:26: k+= NOT k+= IN p_FTUnaryNot
-                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14123); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1749:26: k+= NOT k+= IN p_FTUnaryNot
+                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14171); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46060,7 +46105,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14127); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46071,12 +46116,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131);
-                    p_FTUnaryNot596=this.p_FTUnaryNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179);
+                    p_FTUnaryNot583=this.p_FTUnaryNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot596.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot583.getTree());
 
 
                     break;
@@ -46122,7 +46167,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1751:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
+    // xquery/XQueryParser.g:1753:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
     // $ANTLR start "p_FTUnaryNot"
     p_FTUnaryNot: function() {
         var retval = new XQueryParser.p_FTUnaryNot_return();
@@ -46131,16 +46176,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kn = null;
-         var p_FTPrimaryWithOptions597 = null;
+         var p_FTPrimaryWithOptions584 = null;
 
         var kn_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1752:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )? p_FTPrimaryWithOptions
+            // xquery/XQueryParser.g:1754:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )? p_FTPrimaryWithOptions
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )?
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )?
             var alt199=2;
             var LA199_0 = this.input.LA(1);
 
@@ -46149,8 +46194,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt199) {
                 case 1 :
-                    // xquery/XQueryParser.g:1752:13: kn= FTNOT
-                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14164); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1754:13: kn= FTNOT
+                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14212); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kn_tree = this.adaptor.create(kn);
                     this.adaptor.addChild(root_0, kn_tree);
@@ -46164,12 +46209,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171);
-            p_FTPrimaryWithOptions597=this.p_FTPrimaryWithOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219);
+            p_FTPrimaryWithOptions584=this.p_FTPrimaryWithOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions597.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions584.getTree());
 
 
 
@@ -46206,7 +46251,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1756:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
+    // xquery/XQueryParser.g:1758:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
     // $ANTLR start "p_FTPrimaryWithOptions"
     p_FTPrimaryWithOptions: function() {
         var retval = new XQueryParser.p_FTPrimaryWithOptions_return();
@@ -46214,23 +46259,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTPrimary598 = null;
-         var p_FTMatchOptions599 = null;
-         var p_FTWeight600 = null;
+         var p_FTPrimary585 = null;
+         var p_FTMatchOptions586 = null;
+         var p_FTWeight587 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1757:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
-            // xquery/XQueryParser.g:1757:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
+            // xquery/XQueryParser.g:1759:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197);
-            p_FTPrimary598=this.p_FTPrimary();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245);
+            p_FTPrimary585=this.p_FTPrimary();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary598.getTree());
-            // xquery/XQueryParser.g:1757:23: ( p_FTMatchOptions )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary585.getTree());
+            // xquery/XQueryParser.g:1759:23: ( p_FTMatchOptions )?
             var alt200=2;
             var LA200_0 = this.input.LA(1);
 
@@ -46239,20 +46284,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt200) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:23: p_FTMatchOptions
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199);
-                    p_FTMatchOptions599=this.p_FTMatchOptions();
+                    // xquery/XQueryParser.g:1759:23: p_FTMatchOptions
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247);
+                    p_FTMatchOptions586=this.p_FTMatchOptions();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions599.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions586.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1757:41: ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:41: ( p_FTWeight )?
             var alt201=2;
             var LA201_0 = this.input.LA(1);
 
@@ -46261,13 +46306,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt201) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:41: p_FTWeight
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202);
-                    p_FTWeight600=this.p_FTWeight();
+                    // xquery/XQueryParser.g:1759:41: p_FTWeight
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250);
+                    p_FTWeight587=this.p_FTWeight();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight600.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight587.getTree());
 
 
                     break;
@@ -46310,7 +46355,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1764:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
+    // xquery/XQueryParser.g:1766:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
     // $ANTLR start "p_FTPrimary"
     p_FTPrimary: function() {
         var retval = new XQueryParser.p_FTPrimary_return();
@@ -46318,18 +46363,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN603 = null;
-        var RPAREN605 = null;
-         var p_FTWords601 = null;
-         var p_FTTimes602 = null;
-         var p_FTSelection604 = null;
-         var p_FTExtensionSelection606 = null;
+        var LPAREN590 = null;
+        var RPAREN592 = null;
+         var p_FTWords588 = null;
+         var p_FTTimes589 = null;
+         var p_FTSelection591 = null;
+         var p_FTExtensionSelection593 = null;
 
-        var LPAREN603_tree=null;
-        var RPAREN605_tree=null;
+        var LPAREN590_tree=null;
+        var RPAREN592_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1765:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
+            // xquery/XQueryParser.g:1767:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
             var alt203=3;
             switch ( this.input.LA(1) ) {
             case LBRACKET:
@@ -46353,18 +46398,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt203) {
                 case 1 :
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
-                    // xquery/XQueryParser.g:1765:12: p_FTWords ( p_FTTimes )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14233);
-                    p_FTWords601=this.p_FTWords();
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:12: p_FTWords ( p_FTTimes )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14281);
+                    p_FTWords588=this.p_FTWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords601.getTree());
-                    // xquery/XQueryParser.g:1765:22: ( p_FTTimes )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords588.getTree());
+                    // xquery/XQueryParser.g:1767:22: ( p_FTTimes )?
                     var alt202=2;
                     var LA202_0 = this.input.LA(1);
 
@@ -46373,13 +46418,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt202) {
                         case 1 :
-                            // xquery/XQueryParser.g:1765:22: p_FTTimes
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14235);
-                            p_FTTimes602=this.p_FTTimes();
+                            // xquery/XQueryParser.g:1767:22: p_FTTimes
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14283);
+                            p_FTTimes589=this.p_FTTimes();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes602.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes589.getTree());
 
 
                             break;
@@ -46393,26 +46438,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
-                    // xquery/XQueryParser.g:1766:12: LPAREN p_FTSelection RPAREN
-                    LPAREN603=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14250); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:12: LPAREN p_FTSelection RPAREN
+                    LPAREN590=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14298); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN603_tree = this.adaptor.create(LPAREN603);
-                    this.adaptor.addChild(root_0, LPAREN603_tree);
+                    LPAREN590_tree = this.adaptor.create(LPAREN590);
+                    this.adaptor.addChild(root_0, LPAREN590_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14252);
-                    p_FTSelection604=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14300);
+                    p_FTSelection591=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection604.getTree());
-                    RPAREN605=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14254); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection591.getTree());
+                    RPAREN592=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14302); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN605_tree = this.adaptor.create(RPAREN605);
-                    this.adaptor.addChild(root_0, RPAREN605_tree);
+                    RPAREN592_tree = this.adaptor.create(RPAREN592);
+                    this.adaptor.addChild(root_0, RPAREN592_tree);
                     }
 
 
@@ -46421,15 +46466,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1767:11: p_FTExtensionSelection
+                    // xquery/XQueryParser.g:1769:11: p_FTExtensionSelection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267);
-                    p_FTExtensionSelection606=this.p_FTExtensionSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315);
+                    p_FTExtensionSelection593=this.p_FTExtensionSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection606.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection593.getTree());
 
 
                     break;
@@ -46468,7 +46513,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1771:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
+    // xquery/XQueryParser.g:1773:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
     // $ANTLR start "p_FTWords"
     p_FTWords: function() {
         var retval = new XQueryParser.p_FTWords_return();
@@ -46476,22 +46521,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTWordsValue607 = null;
-         var p_FTAnyallOption608 = null;
+         var p_FTWordsValue594 = null;
+         var p_FTAnyallOption595 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1772:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
-            // xquery/XQueryParser.g:1772:11: p_FTWordsValue ( p_FTAnyallOption )?
+            // xquery/XQueryParser.g:1774:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
+            // xquery/XQueryParser.g:1774:11: p_FTWordsValue ( p_FTAnyallOption )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14293);
-            p_FTWordsValue607=this.p_FTWordsValue();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14341);
+            p_FTWordsValue594=this.p_FTWordsValue();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue607.getTree());
-            // xquery/XQueryParser.g:1772:26: ( p_FTAnyallOption )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue594.getTree());
+            // xquery/XQueryParser.g:1774:26: ( p_FTAnyallOption )?
             var alt204=2;
             var LA204_0 = this.input.LA(1);
 
@@ -46500,13 +46545,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt204) {
                 case 1 :
-                    // xquery/XQueryParser.g:1772:26: p_FTAnyallOption
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14295);
-                    p_FTAnyallOption608=this.p_FTAnyallOption();
+                    // xquery/XQueryParser.g:1774:26: p_FTAnyallOption
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14343);
+                    p_FTAnyallOption595=this.p_FTAnyallOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption608.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption595.getTree());
 
 
                     break;
@@ -46549,7 +46594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1776:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
+    // xquery/XQueryParser.g:1778:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
     // $ANTLR start "p_FTWordsValue"
     p_FTWordsValue: function() {
         var retval = new XQueryParser.p_FTWordsValue_return();
@@ -46557,16 +46602,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET610 = null;
-        var RBRACKET612 = null;
-         var p_StringLiteral609 = null;
-         var p_Expr611 = null;
+        var LBRACKET597 = null;
+        var RBRACKET599 = null;
+         var p_StringLiteral596 = null;
+         var p_Expr598 = null;
 
-        var LBRACKET610_tree=null;
-        var RBRACKET612_tree=null;
+        var LBRACKET597_tree=null;
+        var RBRACKET599_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1777:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1779:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt205=2;
             var LA205_0 = this.input.LA(1);
 
@@ -46585,39 +46630,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt205) {
                 case 1 :
-                    // xquery/XQueryParser.g:1777:11: p_StringLiteral
+                    // xquery/XQueryParser.g:1779:11: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14322);
-                    p_StringLiteral609=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14370);
+                    p_StringLiteral596=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral609.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral596.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1778:12: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET610=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14335); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:12: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET597=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14383); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET610_tree = this.adaptor.create(LBRACKET610);
-                    this.adaptor.addChild(root_0, LBRACKET610_tree);
+                    LBRACKET597_tree = this.adaptor.create(LBRACKET597);
+                    this.adaptor.addChild(root_0, LBRACKET597_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14337);
-                    p_Expr611=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14385);
+                    p_Expr598=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr611.getTree());
-                    RBRACKET612=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14340); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr598.getTree());
+                    RBRACKET599=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14388); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET612_tree = this.adaptor.create(RBRACKET612);
-                    this.adaptor.addChild(root_0, RBRACKET612_tree);
+                    RBRACKET599_tree = this.adaptor.create(RBRACKET599);
+                    this.adaptor.addChild(root_0, RBRACKET599_tree);
                     }
 
 
@@ -46660,7 +46705,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1782:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
+    // xquery/XQueryParser.g:1784:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
     // $ANTLR start "p_FTExtensionSelection"
     p_FTExtensionSelection: function() {
         var retval = new XQueryParser.p_FTExtensionSelection_return();
@@ -46668,21 +46713,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma613 = null;
-        var LBRACKET614 = null;
-        var RBRACKET616 = null;
-         var p_FTSelection615 = null;
+        var L_Pragma600 = null;
+        var LBRACKET601 = null;
+        var RBRACKET603 = null;
+         var p_FTSelection602 = null;
 
-        var L_Pragma613_tree=null;
-        var LBRACKET614_tree=null;
-        var RBRACKET616_tree=null;
+        var L_Pragma600_tree=null;
+        var LBRACKET601_tree=null;
+        var RBRACKET603_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1783:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
+            // xquery/XQueryParser.g:1785:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+
             var cnt206=0;
             loop206:
             do {
@@ -46696,11 +46741,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt206) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:11: L_Pragma
-                    L_Pragma613=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1785:11: L_Pragma
+                    L_Pragma600=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma613_tree = this.adaptor.create(L_Pragma613);
-                    this.adaptor.addChild(root_0, L_Pragma613_tree);
+                    L_Pragma600_tree = this.adaptor.create(L_Pragma600);
+                    this.adaptor.addChild(root_0, L_Pragma600_tree);
                     }
 
 
@@ -46717,12 +46762,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt206++;
             } while (true);
 
-            LBRACKET614=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14370); if (this.state.failed) return retval;
+            LBRACKET601=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14418); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET614_tree = this.adaptor.create(LBRACKET614);
-            this.adaptor.addChild(root_0, LBRACKET614_tree);
+            LBRACKET601_tree = this.adaptor.create(LBRACKET601);
+            this.adaptor.addChild(root_0, LBRACKET601_tree);
             }
-            // xquery/XQueryParser.g:1783:30: ( p_FTSelection )?
+            // xquery/XQueryParser.g:1785:30: ( p_FTSelection )?
             var alt207=2;
             var LA207_0 = this.input.LA(1);
 
@@ -46731,23 +46776,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt207) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:30: p_FTSelection
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372);
-                    p_FTSelection615=this.p_FTSelection();
+                    // xquery/XQueryParser.g:1785:30: p_FTSelection
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420);
+                    p_FTSelection602=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection615.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection602.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET616=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14375); if (this.state.failed) return retval;
+            RBRACKET603=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14423); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET616_tree = this.adaptor.create(RBRACKET616);
-            this.adaptor.addChild(root_0, RBRACKET616_tree);
+            RBRACKET603_tree = this.adaptor.create(RBRACKET603);
+            this.adaptor.addChild(root_0, RBRACKET603_tree);
             }
 
 
@@ -46785,7 +46830,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1787:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
+    // xquery/XQueryParser.g:1789:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
     // $ANTLR start "p_FTAnyallOption"
     p_FTAnyallOption: function() {
         var retval = new XQueryParser.p_FTAnyallOption_return();
@@ -46793,19 +46838,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var WORDS617 = null;
+        var WORDS604 = null;
         var k = null;
         var list_k=null;
 
-        var WORDS617_tree=null;
+        var WORDS604_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1788:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             var alt210=3;
             switch ( this.input.LA(1) ) {
             case ANY:
@@ -46827,10 +46872,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt210) {
                 case 1 :
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:14: k+= ANY (k+= WORD )?
-                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14406); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:14: k+= ANY (k+= WORD )?
+                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14454); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46838,7 +46883,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:22: (k+= WORD )?
+                    // xquery/XQueryParser.g:1790:22: (k+= WORD )?
                     var alt208=2;
                     var LA208_0 = this.input.LA(1);
 
@@ -46847,8 +46892,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt208) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:22: k+= WORD
-                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14410); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:22: k+= WORD
+                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14458); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -46869,10 +46914,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:34: k+= ALL ( WORDS )?
-                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14419); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:34: k+= ALL ( WORDS )?
+                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14467); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46880,7 +46925,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:41: ( WORDS )?
+                    // xquery/XQueryParser.g:1790:41: ( WORDS )?
                     var alt209=2;
                     var LA209_0 = this.input.LA(1);
 
@@ -46889,11 +46934,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt209) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:41: WORDS
-                            WORDS617=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14421); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:41: WORDS
+                            WORDS604=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14469); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            WORDS617_tree = this.adaptor.create(WORDS617);
-                            this.adaptor.addChild(root_0, WORDS617_tree);
+                            WORDS604_tree = this.adaptor.create(WORDS604);
+                            this.adaptor.addChild(root_0, WORDS604_tree);
                             }
 
 
@@ -46908,8 +46953,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1788:51: k+= PHRASE
-                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14429); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:51: k+= PHRASE
+                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14477); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -46962,7 +47007,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1792:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
+    // xquery/XQueryParser.g:1794:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
     // $ANTLR start "p_FTTimes"
     p_FTTimes: function() {
         var retval = new XQueryParser.p_FTTimes_return();
@@ -46972,16 +47017,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTRange618 = null;
+         var p_FTRange605 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1793:9: (k+= OCCURS p_FTRange k+= TIMES )
-            // xquery/XQueryParser.g:1793:11: k+= OCCURS p_FTRange k+= TIMES
+            // xquery/XQueryParser.g:1795:9: (k+= OCCURS p_FTRange k+= TIMES )
+            // xquery/XQueryParser.g:1795:11: k+= OCCURS p_FTRange k+= TIMES
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14461); if (this.state.failed) return retval;
+            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -46989,13 +47034,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14463);
-            p_FTRange618=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14511);
+            p_FTRange605=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
-            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14467); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange605.getTree());
+            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -47042,7 +47087,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1797:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
+    // xquery/XQueryParser.g:1799:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
     // $ANTLR start "p_FTRange"
     p_FTRange: function() {
         var retval = new XQueryParser.p_FTRange_return();
@@ -47052,20 +47097,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_AdditiveExpr619 = null;
-         var p_AdditiveExpr620 = null;
-         var p_AdditiveExpr621 = null;
-         var p_AdditiveExpr622 = null;
-         var p_AdditiveExpr623 = null;
+         var p_AdditiveExpr606 = null;
+         var p_AdditiveExpr607 = null;
+         var p_AdditiveExpr608 = null;
+         var p_AdditiveExpr609 = null;
+         var p_AdditiveExpr610 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1798:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             var alt211=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -47101,74 +47146,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt211) {
                 case 1 :
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:14: k+= EXACTLY p_AdditiveExpr
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14500); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14502);
-                    p_AdditiveExpr619=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr619.getTree());
-
-
-
-
-
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:14: k+= AT k+= LEAST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14520); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14524); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14526);
-                    p_AdditiveExpr620=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr620.getTree());
-
-
-
-
-
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:14: k+= AT k+= MOST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14544); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:14: k+= EXACTLY p_AdditiveExpr
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47177,11 +47158,75 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     list_k.push(k);
 
                     this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14550);
-                    p_AdditiveExpr621=this.p_AdditiveExpr();
+                    p_AdditiveExpr606=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr621.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr606.getTree());
+
+
+
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:14: k+= AT k+= LEAST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14568); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14572); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14574);
+                    p_AdditiveExpr607=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr607.getTree());
+
+
+
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:14: k+= AT k+= MOST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14592); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14596); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14598);
+                    p_AdditiveExpr608=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr608.getTree());
 
 
 
@@ -47189,10 +47234,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14568); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14616); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47200,13 +47245,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14570);
-                    p_AdditiveExpr622=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14618);
+                    p_AdditiveExpr609=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr622.getTree());
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14574); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr609.getTree());
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14622); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47214,12 +47259,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14576);
-                    p_AdditiveExpr623=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14624);
+                    p_AdditiveExpr610=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr623.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr610.getTree());
 
 
 
@@ -47268,7 +47313,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1805:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
+    // xquery/XQueryParser.g:1807:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
     // $ANTLR start "p_FTPosFilter"
     p_FTPosFilter: function() {
         var retval = new XQueryParser.p_FTPosFilter_return();
@@ -47276,15 +47321,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOrder624 = null;
-         var p_FTWindow625 = null;
-         var p_FTDistance626 = null;
-         var p_FTScope627 = null;
-         var p_FTContent628 = null;
+         var p_FTOrder611 = null;
+         var p_FTWindow612 = null;
+         var p_FTDistance613 = null;
+         var p_FTScope614 = null;
+         var p_FTContent615 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1806:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
+            // xquery/XQueryParser.g:1808:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
             var alt212=5;
             switch ( this.input.LA(1) ) {
             case ORDERED:
@@ -47314,67 +47359,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt212) {
                 case 1 :
-                    // xquery/XQueryParser.g:1806:11: p_FTOrder
+                    // xquery/XQueryParser.g:1808:11: p_FTOrder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14607);
-                    p_FTOrder624=this.p_FTOrder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14655);
+                    p_FTOrder611=this.p_FTOrder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder624.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder611.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1806:23: p_FTWindow
+                    // xquery/XQueryParser.g:1808:23: p_FTWindow
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14611);
-                    p_FTWindow625=this.p_FTWindow();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14659);
+                    p_FTWindow612=this.p_FTWindow();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow625.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow612.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1806:36: p_FTDistance
+                    // xquery/XQueryParser.g:1808:36: p_FTDistance
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14615);
-                    p_FTDistance626=this.p_FTDistance();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14663);
+                    p_FTDistance613=this.p_FTDistance();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance626.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance613.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1806:51: p_FTScope
+                    // xquery/XQueryParser.g:1808:51: p_FTScope
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14619);
-                    p_FTScope627=this.p_FTScope();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14667);
+                    p_FTScope614=this.p_FTScope();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope627.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope614.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1806:63: p_FTContent
+                    // xquery/XQueryParser.g:1808:63: p_FTContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14623);
-                    p_FTContent628=this.p_FTContent();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14671);
+                    p_FTContent615=this.p_FTContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent628.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent615.getTree());
 
 
                     break;
@@ -47413,7 +47458,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1810:1: p_FTOrder : ko= ORDERED ;
+    // xquery/XQueryParser.g:1812:1: p_FTOrder : ko= ORDERED ;
     // $ANTLR start "p_FTOrder"
     p_FTOrder: function() {
         var retval = new XQueryParser.p_FTOrder_return();
@@ -47426,11 +47471,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1811:9: (ko= ORDERED )
-            // xquery/XQueryParser.g:1811:11: ko= ORDERED
+            // xquery/XQueryParser.g:1813:9: (ko= ORDERED )
+            // xquery/XQueryParser.g:1813:11: ko= ORDERED
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14651); if (this.state.failed) return retval;
+            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14699); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -47474,7 +47519,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1815:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
+    // xquery/XQueryParser.g:1817:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
     // $ANTLR start "p_FTWindow"
     p_FTWindow: function() {
         var retval = new XQueryParser.p_FTWindow_return();
@@ -47483,17 +47528,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-         var p_AdditiveExpr629 = null;
-         var p_FTUnit630 = null;
+         var p_AdditiveExpr616 = null;
+         var p_FTUnit617 = null;
 
         var kw_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1816:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
-            // xquery/XQueryParser.g:1816:11: kw= WINDOW p_AdditiveExpr p_FTUnit
+            // xquery/XQueryParser.g:1818:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
+            // xquery/XQueryParser.g:1818:11: kw= WINDOW p_AdditiveExpr p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14681); if (this.state.failed) return retval;
+            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14729); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -47501,18 +47546,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14685);
-            p_AdditiveExpr629=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14733);
+            p_AdditiveExpr616=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr629.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14687);
-            p_FTUnit630=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr616.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14735);
+            p_FTUnit617=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit630.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit617.getTree());
 
 
 
@@ -47549,7 +47594,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1820:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
+    // xquery/XQueryParser.g:1822:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
     // $ANTLR start "p_FTDistance"
     p_FTDistance: function() {
         var retval = new XQueryParser.p_FTDistance_return();
@@ -47558,17 +47603,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kd = null;
-         var p_FTRange631 = null;
-         var p_FTUnit632 = null;
+         var p_FTRange618 = null;
+         var p_FTUnit619 = null;
 
         var kd_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1821:9: (kd= DISTANCE p_FTRange p_FTUnit )
-            // xquery/XQueryParser.g:1821:11: kd= DISTANCE p_FTRange p_FTUnit
+            // xquery/XQueryParser.g:1823:9: (kd= DISTANCE p_FTRange p_FTUnit )
+            // xquery/XQueryParser.g:1823:11: kd= DISTANCE p_FTRange p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14715); if (this.state.failed) return retval;
+            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kd_tree = this.adaptor.create(kd);
             this.adaptor.addChild(root_0, kd_tree);
@@ -47576,18 +47621,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kd);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14719);
-            p_FTRange631=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14767);
+            p_FTRange618=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange631.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14721);
-            p_FTUnit632=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14769);
+            p_FTUnit619=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit632.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit619.getTree());
 
 
 
@@ -47624,7 +47669,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1825:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
+    // xquery/XQueryParser.g:1827:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
     // $ANTLR start "p_FTUnit"
     p_FTUnit: function() {
         var retval = new XQueryParser.p_FTUnit_return();
@@ -47638,11 +47683,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1826:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             var alt213=3;
             switch ( this.input.LA(1) ) {
             case WORDS:
@@ -47664,8 +47709,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt213) {
                 case 1 :
-                    // xquery/XQueryParser.g:1826:13: k+= WORDS
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14751); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:13: k+= WORDS
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14799); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47677,8 +47722,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1826:24: k+= SENTENCES
-                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14757); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:24: k+= SENTENCES
+                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14805); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47690,8 +47735,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1826:39: k+= PARAGRAPHS
-                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14763); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:39: k+= PARAGRAPHS
+                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14811); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47744,7 +47789,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1830:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
+    // xquery/XQueryParser.g:1832:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
     // $ANTLR start "p_FTScope"
     p_FTScope: function() {
         var retval = new XQueryParser.p_FTScope_return();
@@ -47754,16 +47799,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTBigUnit633 = null;
+         var p_FTBigUnit620 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1831:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
+            // xquery/XQueryParser.g:1833:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT )
             var alt214=2;
             var LA214_0 = this.input.LA(1);
 
@@ -47782,8 +47827,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt214) {
                 case 1 :
-                    // xquery/XQueryParser.g:1831:12: k+= SAME
-                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14796); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:12: k+= SAME
+                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14844); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47795,8 +47840,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1831:22: k+= DIFFERENT
-                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14802); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:22: k+= DIFFERENT
+                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14850); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47813,12 +47858,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14807);
-            p_FTBigUnit633=this.p_FTBigUnit();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14855);
+            p_FTBigUnit620=this.p_FTBigUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit633.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit620.getTree());
 
 
 
@@ -47855,7 +47900,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1835:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
+    // xquery/XQueryParser.g:1837:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
     // $ANTLR start "p_FTBigUnit"
     p_FTBigUnit: function() {
         var retval = new XQueryParser.p_FTBigUnit_return();
@@ -47869,11 +47914,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1836:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             var alt215=2;
             var LA215_0 = this.input.LA(1);
 
@@ -47892,8 +47937,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt215) {
                 case 1 :
-                    // xquery/XQueryParser.g:1836:13: k+= SENTENCE
-                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14837); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:13: k+= SENTENCE
+                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14885); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47905,8 +47950,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1836:27: k+= PARAGRAPH
-                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14843); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:27: k+= PARAGRAPH
+                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14891); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -47959,7 +48004,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1840:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
+    // xquery/XQueryParser.g:1842:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
     // $ANTLR start "p_FTContent"
     p_FTContent: function() {
         var retval = new XQueryParser.p_FTContent_return();
@@ -47973,11 +48018,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1841:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             var alt216=3;
             var LA216_0 = this.input.LA(1);
 
@@ -48010,10 +48055,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt216) {
                 case 1 :
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:14: k+= AT k+= START
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14878); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:14: k+= AT k+= START
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14926); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48021,7 +48066,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14882); if (this.state.failed) return retval;
+                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48036,10 +48081,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:33: k+= AT k+= END
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14890); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:33: k+= AT k+= END
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14938); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48047,7 +48092,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14894); if (this.state.failed) return retval;
+                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14942); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48062,10 +48107,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:50: k+= ENTIRE k+= CONTENT
-                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14902); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:50: k+= ENTIRE k+= CONTENT
+                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14950); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48073,7 +48118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14906); if (this.state.failed) return retval;
+                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14954); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48129,7 +48174,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1845:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
+    // xquery/XQueryParser.g:1847:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
     // $ANTLR start "p_FTMatchOptions"
     p_FTMatchOptions: function() {
         var retval = new XQueryParser.p_FTMatchOptions_return();
@@ -48138,16 +48183,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ku = null;
-         var p_FTMatchOption634 = null;
+         var p_FTMatchOption621 = null;
 
         var ku_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1846:9: ( (ku= USING p_FTMatchOption )+ )
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:9: ( (ku= USING p_FTMatchOption )+ )
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             var cnt217=0;
             loop217:
             do {
@@ -48161,8 +48206,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt217) {
                 case 1 :
-                    // xquery/XQueryParser.g:1846:12: ku= USING p_FTMatchOption
-                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14940); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1848:12: ku= USING p_FTMatchOption
+                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14988); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ku_tree = this.adaptor.create(ku);
                     this.adaptor.addChild(root_0, ku_tree);
@@ -48170,12 +48215,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ku);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944);
-                    p_FTMatchOption634=this.p_FTMatchOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992);
+                    p_FTMatchOption621=this.p_FTMatchOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption634.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption621.getTree());
 
 
                     break;
@@ -48227,7 +48272,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
+    // xquery/XQueryParser.g:1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
     // $ANTLR start "p_FTMatchOption"
     p_FTMatchOption: function() {
         var retval = new XQueryParser.p_FTMatchOption_return();
@@ -48235,122 +48280,122 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTLanguageOption635 = null;
-         var p_FTWildCardOption636 = null;
-         var p_FTThesaurusOption637 = null;
-         var p_FTStemOption638 = null;
-         var p_FTCaseOption639 = null;
-         var p_FTDiacriticsOption640 = null;
-         var p_FTStopWordOption641 = null;
-         var p_FTExtensionOption642 = null;
+         var p_FTLanguageOption622 = null;
+         var p_FTWildCardOption623 = null;
+         var p_FTThesaurusOption624 = null;
+         var p_FTStemOption625 = null;
+         var p_FTCaseOption626 = null;
+         var p_FTDiacriticsOption627 = null;
+         var p_FTStopWordOption628 = null;
+         var p_FTExtensionOption629 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1851:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
+            // xquery/XQueryParser.g:1853:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
             var alt218=8;
             alt218 = this.dfa218.predict(this.input);
             switch (alt218) {
                 case 1 :
-                    // xquery/XQueryParser.g:1851:11: p_FTLanguageOption
+                    // xquery/XQueryParser.g:1853:11: p_FTLanguageOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972);
-                    p_FTLanguageOption635=this.p_FTLanguageOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020);
+                    p_FTLanguageOption622=this.p_FTLanguageOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption635.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption622.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1852:11: p_FTWildCardOption
+                    // xquery/XQueryParser.g:1854:11: p_FTWildCardOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984);
-                    p_FTWildCardOption636=this.p_FTWildCardOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032);
+                    p_FTWildCardOption623=this.p_FTWildCardOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption636.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption623.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1853:11: p_FTThesaurusOption
+                    // xquery/XQueryParser.g:1855:11: p_FTThesaurusOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996);
-                    p_FTThesaurusOption637=this.p_FTThesaurusOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044);
+                    p_FTThesaurusOption624=this.p_FTThesaurusOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption637.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption624.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1854:11: p_FTStemOption
+                    // xquery/XQueryParser.g:1856:11: p_FTStemOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15008);
-                    p_FTStemOption638=this.p_FTStemOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15056);
+                    p_FTStemOption625=this.p_FTStemOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption638.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption625.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1855:11: p_FTCaseOption
+                    // xquery/XQueryParser.g:1857:11: p_FTCaseOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020);
-                    p_FTCaseOption639=this.p_FTCaseOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068);
+                    p_FTCaseOption626=this.p_FTCaseOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption639.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption626.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1856:11: p_FTDiacriticsOption
+                    // xquery/XQueryParser.g:1858:11: p_FTDiacriticsOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032);
-                    p_FTDiacriticsOption640=this.p_FTDiacriticsOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080);
+                    p_FTDiacriticsOption627=this.p_FTDiacriticsOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption640.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption627.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1857:11: p_FTStopWordOption
+                    // xquery/XQueryParser.g:1859:11: p_FTStopWordOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044);
-                    p_FTStopWordOption641=this.p_FTStopWordOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092);
+                    p_FTStopWordOption628=this.p_FTStopWordOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption641.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption628.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1858:11: p_FTExtensionOption
+                    // xquery/XQueryParser.g:1860:11: p_FTExtensionOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056);
-                    p_FTExtensionOption642=this.p_FTExtensionOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104);
+                    p_FTExtensionOption629=this.p_FTExtensionOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption642.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption629.getTree());
 
 
                     break;
@@ -48389,7 +48434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1862:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
+    // xquery/XQueryParser.g:1864:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
     // $ANTLR start "p_FTCaseOption"
     p_FTCaseOption: function() {
         var retval = new XQueryParser.p_FTCaseOption_return();
@@ -48403,11 +48448,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1863:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             var alt219=4;
             switch ( this.input.LA(1) ) {
             case CASE:
@@ -48443,10 +48488,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt219) {
                 case 1 :
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:14: k+= CASE k+= INSENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15087); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:14: k+= CASE k+= INSENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15135); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48454,7 +48499,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15091); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15139); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48469,10 +48514,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:14: k+= CASE k+= SENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15109); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:14: k+= CASE k+= SENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15157); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48480,7 +48525,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15113); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48495,8 +48540,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1865:13: k+= LOWERCASE
-                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15130); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1867:13: k+= LOWERCASE
+                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15178); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48508,8 +48553,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1866:13: k+= UPPERCASE
-                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15146); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1868:13: k+= UPPERCASE
+                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15194); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48562,7 +48607,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1870:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
+    // xquery/XQueryParser.g:1872:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
     // $ANTLR start "p_FTDiacriticsOption"
     p_FTDiacriticsOption: function() {
         var retval = new XQueryParser.p_FTDiacriticsOption_return();
@@ -48576,11 +48621,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1871:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             var alt220=2;
             var LA220_0 = this.input.LA(1);
 
@@ -48610,10 +48655,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt220) {
                 case 1 :
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:14: k+= DIACRITICS k+= INSENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:14: k+= DIACRITICS k+= INSENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48621,7 +48666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48636,10 +48681,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:14: k+= DIACRITICS k+= SENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:14: k+= DIACRITICS k+= SENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48647,7 +48692,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48703,7 +48748,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1876:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
+    // xquery/XQueryParser.g:1878:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
     // $ANTLR start "p_FTStemOption"
     p_FTStemOption: function() {
         var retval = new XQueryParser.p_FTStemOption_return();
@@ -48717,11 +48762,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1877:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             var alt221=2;
             var LA221_0 = this.input.LA(1);
 
@@ -48740,8 +48785,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt221) {
                 case 1 :
-                    // xquery/XQueryParser.g:1877:13: k+= STEMMING
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15242); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:13: k+= STEMMING
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48753,10 +48798,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:28: k+= NO k+= STEMMING
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15249); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:28: k+= NO k+= STEMMING
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15297); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48764,7 +48809,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15253); if (this.state.failed) return retval;
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15301); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48820,7 +48865,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1881:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
+    // xquery/XQueryParser.g:1883:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
     // $ANTLR start "p_FTThesaurusOption"
     p_FTThesaurusOption: function() {
         var retval = new XQueryParser.p_FTThesaurusOption_return();
@@ -48828,26 +48873,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN644 = null;
-        var COMMA646 = null;
-        var RPAREN648 = null;
+        var LPAREN631 = null;
+        var COMMA633 = null;
+        var RPAREN635 = null;
         var k = null;
         var list_k=null;
-         var p_FTThesaurusID643 = null;
-         var p_FTThesaurusID645 = null;
-         var p_FTThesaurusID647 = null;
+         var p_FTThesaurusID630 = null;
+         var p_FTThesaurusID632 = null;
+         var p_FTThesaurusID634 = null;
 
-        var LPAREN644_tree=null;
-        var COMMA646_tree=null;
-        var RPAREN648_tree=null;
+        var LPAREN631_tree=null;
+        var COMMA633_tree=null;
+        var RPAREN635_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1882:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             var alt225=3;
             var LA225_0 = this.input.LA(1);
 
@@ -48880,10 +48925,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt225) {
                 case 1 :
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15289); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15337); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48891,7 +48936,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1882:27: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1884:27: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt222=2;
                     var LA222_0 = this.input.LA(1);
 
@@ -48910,19 +48955,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt222) {
                         case 1 :
-                            // xquery/XQueryParser.g:1882:28: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292);
-                            p_FTThesaurusID643=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1884:28: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340);
+                            p_FTThesaurusID630=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID643.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID630.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1882:46: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15298); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1884:46: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15346); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -48943,10 +48988,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15317); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15365); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -48954,12 +48999,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    LPAREN644=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15319); if (this.state.failed) return retval;
+                    LPAREN631=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15367); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN644_tree = this.adaptor.create(LPAREN644);
-                    this.adaptor.addChild(root_0, LPAREN644_tree);
+                    LPAREN631_tree = this.adaptor.create(LPAREN631);
+                    this.adaptor.addChild(root_0, LPAREN631_tree);
                     }
-                    // xquery/XQueryParser.g:1883:34: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1885:34: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt223=2;
                     var LA223_0 = this.input.LA(1);
 
@@ -48978,19 +49023,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt223) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:35: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322);
-                            p_FTThesaurusID645=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1885:35: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370);
+                            p_FTThesaurusID632=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID645.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID632.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1883:53: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15328); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:53: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15376); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -49004,7 +49049,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    // xquery/XQueryParser.g:1883:65: ( COMMA p_FTThesaurusID )*
+                    // xquery/XQueryParser.g:1885:65: ( COMMA p_FTThesaurusID )*
                     loop224:
                     do {
                         var alt224=2;
@@ -49017,18 +49062,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt224) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:66: COMMA p_FTThesaurusID
-                            COMMA646=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15332); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:66: COMMA p_FTThesaurusID
+                            COMMA633=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15380); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA646_tree = this.adaptor.create(COMMA646);
-                            this.adaptor.addChild(root_0, COMMA646_tree);
+                            COMMA633_tree = this.adaptor.create(COMMA633);
+                            this.adaptor.addChild(root_0, COMMA633_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334);
-                            p_FTThesaurusID647=this.p_FTThesaurusID();
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382);
+                            p_FTThesaurusID634=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID647.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID634.getTree());
 
 
                             break;
@@ -49038,10 +49083,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN648=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15338); if (this.state.failed) return retval;
+                    RPAREN635=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15386); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN648_tree = this.adaptor.create(RPAREN648);
-                    this.adaptor.addChild(root_0, RPAREN648_tree);
+                    RPAREN635_tree = this.adaptor.create(RPAREN635);
+                    this.adaptor.addChild(root_0, RPAREN635_tree);
                     }
 
 
@@ -49050,10 +49095,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:14: k+= NO k+= THESAURUS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15356); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:14: k+= NO k+= THESAURUS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15404); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49061,7 +49106,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15360); if (this.state.failed) return retval;
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15408); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49117,7 +49162,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1888:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
+    // xquery/XQueryParser.g:1890:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
     // $ANTLR start "p_FTThesaurusID"
     p_FTThesaurusID: function() {
         var retval = new XQueryParser.p_FTThesaurusID_return();
@@ -49127,18 +49172,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral649 = null;
-         var p_StringLiteral650 = null;
-         var p_FTLiteralRange651 = null;
+         var p_StringLiteral636 = null;
+         var p_StringLiteral637 = null;
+         var p_FTLiteralRange638 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1889:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
-            // xquery/XQueryParser.g:1889:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
+            // xquery/XQueryParser.g:1891:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15393); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15441); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -49146,13 +49191,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395);
-            p_StringLiteral649=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443);
+            p_StringLiteral636=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral649.getTree());
-            // xquery/XQueryParser.g:1889:33: (k+= RELATIONSHIP p_StringLiteral )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral636.getTree());
+            // xquery/XQueryParser.g:1891:33: (k+= RELATIONSHIP p_StringLiteral )?
             var alt226=2;
             var LA226_0 = this.input.LA(1);
 
@@ -49161,8 +49206,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt226) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:34: k+= RELATIONSHIP p_StringLiteral
-                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1891:34: k+= RELATIONSHIP p_StringLiteral
+                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49170,19 +49215,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402);
-                    p_StringLiteral650=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450);
+                    p_StringLiteral637=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral637.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1889:68: ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:68: ( p_FTLiteralRange k+= LEVELS )?
             var alt227=2;
             var LA227_0 = this.input.LA(1);
 
@@ -49198,14 +49243,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt227) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:69: p_FTLiteralRange k+= LEVELS
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407);
-                    p_FTLiteralRange651=this.p_FTLiteralRange();
+                    // xquery/XQueryParser.g:1891:69: p_FTLiteralRange k+= LEVELS
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455);
+                    p_FTLiteralRange638=this.p_FTLiteralRange();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange651.getTree());
-                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15411); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange638.getTree());
+                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15459); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49258,7 +49303,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1893:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
+    // xquery/XQueryParser.g:1895:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
     // $ANTLR start "p_FTLiteralRange"
     p_FTLiteralRange: function() {
         var retval = new XQueryParser.p_FTLiteralRange_return();
@@ -49266,29 +49311,29 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_IntegerLiteral652 = null;
-        var L_IntegerLiteral653 = null;
-        var L_IntegerLiteral654 = null;
-        var L_IntegerLiteral655 = null;
-        var TO656 = null;
-        var L_IntegerLiteral657 = null;
+        var L_IntegerLiteral639 = null;
+        var L_IntegerLiteral640 = null;
+        var L_IntegerLiteral641 = null;
+        var L_IntegerLiteral642 = null;
+        var TO643 = null;
+        var L_IntegerLiteral644 = null;
         var k = null;
         var list_k=null;
 
-        var L_IntegerLiteral652_tree=null;
-        var L_IntegerLiteral653_tree=null;
-        var L_IntegerLiteral654_tree=null;
-        var L_IntegerLiteral655_tree=null;
-        var TO656_tree=null;
-        var L_IntegerLiteral657_tree=null;
+        var L_IntegerLiteral639_tree=null;
+        var L_IntegerLiteral640_tree=null;
+        var L_IntegerLiteral641_tree=null;
+        var L_IntegerLiteral642_tree=null;
+        var TO643_tree=null;
+        var L_IntegerLiteral644_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1894:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             var alt228=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -49324,10 +49369,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt228) {
                 case 1 :
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:14: k+= EXACTLY L_IntegerLiteral
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15446); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:14: k+= EXACTLY L_IntegerLiteral
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49335,10 +49380,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral652=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448); if (this.state.failed) return retval;
+                    L_IntegerLiteral639=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral652_tree = this.adaptor.create(L_IntegerLiteral652);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral652_tree);
+                    L_IntegerLiteral639_tree = this.adaptor.create(L_IntegerLiteral639);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral639_tree);
                     }
 
 
@@ -49347,10 +49392,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:14: k+= AT k+= LEAST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15466); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:14: k+= AT k+= LEAST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49358,7 +49403,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15470); if (this.state.failed) return retval;
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49366,10 +49411,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral653=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472); if (this.state.failed) return retval;
+                    L_IntegerLiteral640=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral653_tree = this.adaptor.create(L_IntegerLiteral653);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral653_tree);
+                    L_IntegerLiteral640_tree = this.adaptor.create(L_IntegerLiteral640);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral640_tree);
                     }
 
 
@@ -49378,10 +49423,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:14: k+= AT k+= MOST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15490); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:14: k+= AT k+= MOST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15538); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49389,7 +49434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15542); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49397,10 +49442,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral654=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
+                    L_IntegerLiteral641=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral654_tree = this.adaptor.create(L_IntegerLiteral654);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral654_tree);
+                    L_IntegerLiteral641_tree = this.adaptor.create(L_IntegerLiteral641);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral641_tree);
                     }
 
 
@@ -49409,10 +49454,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15562); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49420,20 +49465,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral655=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516); if (this.state.failed) return retval;
+                    L_IntegerLiteral642=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral655_tree = this.adaptor.create(L_IntegerLiteral655);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral655_tree);
+                    L_IntegerLiteral642_tree = this.adaptor.create(L_IntegerLiteral642);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral642_tree);
                     }
-                    TO656=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
+                    TO643=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15566); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    TO656_tree = this.adaptor.create(TO656);
-                    this.adaptor.addChild(root_0, TO656_tree);
+                    TO643_tree = this.adaptor.create(TO643);
+                    this.adaptor.addChild(root_0, TO643_tree);
                     }
-                    L_IntegerLiteral657=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
+                    L_IntegerLiteral644=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral657_tree = this.adaptor.create(L_IntegerLiteral657);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral657_tree);
+                    L_IntegerLiteral644_tree = this.adaptor.create(L_IntegerLiteral644);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral644_tree);
                     }
 
 
@@ -49483,7 +49528,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1901:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
+    // xquery/XQueryParser.g:1903:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
     // $ANTLR start "p_FTStopWordOption"
     p_FTStopWordOption: function() {
         var retval = new XQueryParser.p_FTStopWordOption_return();
@@ -49493,18 +49538,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords658 = null;
-         var p_FTStopWordsInclExcl659 = null;
-         var p_FTStopWordsInclExcl660 = null;
+         var p_FTStopWords645 = null;
+         var p_FTStopWordsInclExcl646 = null;
+         var p_FTStopWordsInclExcl647 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1902:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             var alt231=3;
             var LA231_0 = this.input.LA(1);
 
@@ -49548,10 +49593,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt231) {
                 case 1 :
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15556); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15604); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49559,7 +49604,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15560); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15608); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49567,13 +49612,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562);
-                    p_FTStopWords658=this.p_FTStopWords();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610);
+                    p_FTStopWords645=this.p_FTStopWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords658.getTree());
-                    // xquery/XQueryParser.g:1902:45: ( p_FTStopWordsInclExcl )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords645.getTree());
+                    // xquery/XQueryParser.g:1904:45: ( p_FTStopWordsInclExcl )*
                     loop229:
                     do {
                         var alt229=2;
@@ -49586,13 +49631,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt229) {
                         case 1 :
-                            // xquery/XQueryParser.g:1902:45: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564);
-                            p_FTStopWordsInclExcl659=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1904:45: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612);
+                            p_FTStopWordsInclExcl646=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl659.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl646.getTree());
 
 
                             break;
@@ -49609,10 +49654,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15583); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15631); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49620,7 +49665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15587); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15635); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49628,7 +49673,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15591); if (this.state.failed) return retval;
+                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15639); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49636,7 +49681,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1903:42: ( p_FTStopWordsInclExcl )*
+                    // xquery/XQueryParser.g:1905:42: ( p_FTStopWordsInclExcl )*
                     loop230:
                     do {
                         var alt230=2;
@@ -49649,13 +49694,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt230) {
                         case 1 :
-                            // xquery/XQueryParser.g:1903:42: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593);
-                            p_FTStopWordsInclExcl660=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1905:42: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641);
+                            p_FTStopWordsInclExcl647=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl660.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl647.getTree());
 
 
                             break;
@@ -49672,10 +49717,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:14: k+= NO k+= STOP k+= WORDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15612); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:14: k+= NO k+= STOP k+= WORDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15660); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49683,7 +49728,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15616); if (this.state.failed) return retval;
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15664); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49691,7 +49736,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15620); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15668); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49747,7 +49792,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1908:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
+    // xquery/XQueryParser.g:1910:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
     // $ANTLR start "p_FTStopWords"
     p_FTStopWords: function() {
         var retval = new XQueryParser.p_FTStopWords_return();
@@ -49756,20 +49801,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-        var LPAREN662 = null;
-        var COMMA664 = null;
-        var RPAREN666 = null;
-         var p_StringLiteral661 = null;
-         var p_StringLiteral663 = null;
-         var p_StringLiteral665 = null;
+        var LPAREN649 = null;
+        var COMMA651 = null;
+        var RPAREN653 = null;
+         var p_StringLiteral648 = null;
+         var p_StringLiteral650 = null;
+         var p_StringLiteral652 = null;
 
         var ka_tree=null;
-        var LPAREN662_tree=null;
-        var COMMA664_tree=null;
-        var RPAREN666_tree=null;
+        var LPAREN649_tree=null;
+        var COMMA651_tree=null;
+        var RPAREN653_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1909:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
+            // xquery/XQueryParser.g:1911:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
             var alt233=2;
             var LA233_0 = this.input.LA(1);
 
@@ -49788,12 +49833,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt233) {
                 case 1 :
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
-                    // xquery/XQueryParser.g:1909:12: ka= AT p_StringLiteral
-                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15654); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:12: ka= AT p_StringLiteral
+                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15702); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -49801,12 +49846,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15658);
-                    p_StringLiteral661=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15706);
+                    p_StringLiteral648=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral661.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral648.getTree());
 
 
 
@@ -49814,23 +49859,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
-                    // xquery/XQueryParser.g:1910:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
-                    LPAREN662=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15672); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
+                    LPAREN649=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN662_tree = this.adaptor.create(LPAREN662);
-                    this.adaptor.addChild(root_0, LPAREN662_tree);
+                    LPAREN649_tree = this.adaptor.create(LPAREN649);
+                    this.adaptor.addChild(root_0, LPAREN649_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15674);
-                    p_StringLiteral663=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15722);
+                    p_StringLiteral650=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral663.getTree());
-                    // xquery/XQueryParser.g:1910:35: ( COMMA p_StringLiteral )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    // xquery/XQueryParser.g:1912:35: ( COMMA p_StringLiteral )*
                     loop232:
                     do {
                         var alt232=2;
@@ -49843,18 +49888,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt232) {
                         case 1 :
-                            // xquery/XQueryParser.g:1910:36: COMMA p_StringLiteral
-                            COMMA664=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15677); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1912:36: COMMA p_StringLiteral
+                            COMMA651=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15725); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA664_tree = this.adaptor.create(COMMA664);
-                            this.adaptor.addChild(root_0, COMMA664_tree);
+                            COMMA651_tree = this.adaptor.create(COMMA651);
+                            this.adaptor.addChild(root_0, COMMA651_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15679);
-                            p_StringLiteral665=this.p_StringLiteral();
+                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15727);
+                            p_StringLiteral652=this.p_StringLiteral();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral665.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral652.getTree());
 
 
                             break;
@@ -49864,10 +49909,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN666=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15683); if (this.state.failed) return retval;
+                    RPAREN653=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15731); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN666_tree = this.adaptor.create(RPAREN666);
-                    this.adaptor.addChild(root_0, RPAREN666_tree);
+                    RPAREN653_tree = this.adaptor.create(RPAREN653);
+                    this.adaptor.addChild(root_0, RPAREN653_tree);
                     }
 
 
@@ -49910,7 +49955,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1914:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
+    // xquery/XQueryParser.g:1916:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
     // $ANTLR start "p_FTStopWordsInclExcl"
     p_FTStopWordsInclExcl: function() {
         var retval = new XQueryParser.p_FTStopWordsInclExcl_return();
@@ -49920,18 +49965,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords667 = null;
+         var p_FTStopWords654 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1915:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT )
             var alt234=2;
             var LA234_0 = this.input.LA(1);
 
@@ -49950,8 +49995,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt234) {
                 case 1 :
-                    // xquery/XQueryParser.g:1915:14: k+= UNION
-                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15715); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:14: k+= UNION
+                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15763); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49963,8 +50008,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1915:25: k+= EXCEPT
-                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:25: k+= EXCEPT
+                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -49978,12 +50023,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724);
-            p_FTStopWords667=this.p_FTStopWords();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772);
+            p_FTStopWords654=this.p_FTStopWords();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords667.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords654.getTree());
 
 
 
@@ -50026,7 +50071,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1919:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
+    // xquery/XQueryParser.g:1921:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
     // $ANTLR start "p_FTLanguageOption"
     p_FTLanguageOption: function() {
         var retval = new XQueryParser.p_FTLanguageOption_return();
@@ -50035,16 +50080,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kl = null;
-         var p_StringLiteral668 = null;
+         var p_StringLiteral655 = null;
 
         var kl_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1920:9: (kl= LANGUAGE p_StringLiteral )
-            // xquery/XQueryParser.g:1920:11: kl= LANGUAGE p_StringLiteral
+            // xquery/XQueryParser.g:1922:9: (kl= LANGUAGE p_StringLiteral )
+            // xquery/XQueryParser.g:1922:11: kl= LANGUAGE p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15756); if (this.state.failed) return retval;
+            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15804); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kl_tree = this.adaptor.create(kl);
             this.adaptor.addChild(root_0, kl_tree);
@@ -50052,12 +50097,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kl);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760);
-            p_StringLiteral668=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808);
+            p_StringLiteral655=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral668.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral655.getTree());
 
 
 
@@ -50094,7 +50139,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1924:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
+    // xquery/XQueryParser.g:1926:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
     // $ANTLR start "p_FTWildCardOption"
     p_FTWildCardOption: function() {
         var retval = new XQueryParser.p_FTWildCardOption_return();
@@ -50108,11 +50153,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1925:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             var alt235=2;
             var LA235_0 = this.input.LA(1);
 
@@ -50131,8 +50176,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt235) {
                 case 1 :
-                    // xquery/XQueryParser.g:1925:13: k+= WILDCARDS
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15790); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:13: k+= WILDCARDS
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15838); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50144,10 +50189,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:29: k+= NO k+= WILDCARDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15797); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:29: k+= NO k+= WILDCARDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15845); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50155,7 +50200,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15801); if (this.state.failed) return retval;
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15849); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -50211,7 +50256,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1929:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
+    // xquery/XQueryParser.g:1931:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
     // $ANTLR start "p_FTExtensionOption"
     p_FTExtensionOption: function() {
         var retval = new XQueryParser.p_FTExtensionOption_return();
@@ -50220,17 +50265,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_QName669 = null;
-         var p_StringLiteral670 = null;
+         var p_QName656 = null;
+         var p_StringLiteral657 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1930:9: (ko= OPTION p_QName p_StringLiteral )
-            // xquery/XQueryParser.g:1930:11: ko= OPTION p_QName p_StringLiteral
+            // xquery/XQueryParser.g:1932:9: (ko= OPTION p_QName p_StringLiteral )
+            // xquery/XQueryParser.g:1932:11: ko= OPTION p_QName p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15834); if (this.state.failed) return retval;
+            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15882); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -50238,18 +50283,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ko);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15838);
-            p_QName669=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15886);
+            p_QName656=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName669.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840);
-            p_StringLiteral670=this.p_StringLiteral();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName656.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888);
+            p_StringLiteral657=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral670.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral657.getTree());
 
 
 
@@ -50286,7 +50331,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1934:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
+    // xquery/XQueryParser.g:1936:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
     // $ANTLR start "p_FTIgnoreOption"
     p_FTIgnoreOption: function() {
         var retval = new XQueryParser.p_FTIgnoreOption_return();
@@ -50296,16 +50341,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_UnionExpr671 = null;
+         var p_UnionExpr658 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1935:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
-            // xquery/XQueryParser.g:1935:11: k+= WITHOUT k+= CONTENT p_UnionExpr
+            // xquery/XQueryParser.g:1937:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
+            // xquery/XQueryParser.g:1937:11: k+= WITHOUT k+= CONTENT p_UnionExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15868); if (this.state.failed) return retval;
+            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15916); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -50313,7 +50358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15872); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -50324,12 +50369,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876);
-            p_UnionExpr671=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924);
+            p_UnionExpr658=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr671.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr658.getTree());
 
 
 
@@ -50366,7 +50411,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1945:1: p_Program : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1947:1: p_Program : p_StatementsAndOptionalExpr ;
     // $ANTLR start "p_Program"
     p_Program: function() {
         var retval = new XQueryParser.p_Program_return();
@@ -50374,20 +50419,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr672 = null;
+         var p_StatementsAndOptionalExpr659 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1946:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1946:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1948:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1948:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908);
-            p_StatementsAndOptionalExpr672=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956);
+            p_StatementsAndOptionalExpr659=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr672.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr659.getTree());
 
 
 
@@ -50424,7 +50469,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1950:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
+    // xquery/XQueryParser.g:1952:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
     // $ANTLR start "p_Statements"
     p_Statements: function(strict) {
         var retval = new XQueryParser.p_Statements_return();
@@ -50432,15 +50477,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Hybrid673 = null;
+         var p_Hybrid660 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1951:9: ( ( p_Hybrid[$strict,true] )* )
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:9: ( ( p_Hybrid[$strict,true] )* )
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             loop236:
             do {
                 var alt236=2;
@@ -50453,13 +50498,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt236) {
                 case 1 :
-                    // xquery/XQueryParser.g:1951:11: p_Hybrid[$strict,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15935);
-                    p_Hybrid673=this.p_Hybrid(strict, true);
+                    // xquery/XQueryParser.g:1953:11: p_Hybrid[$strict,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15983);
+                    p_Hybrid660=this.p_Hybrid(strict, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid673.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid660.getTree());
 
 
                     break;
@@ -50505,7 +50550,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1955:1: p_StatementsAndExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1957:1: p_StatementsAndExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndExpr"
     p_StatementsAndExpr: function() {
         var retval = new XQueryParser.p_StatementsAndExpr_return();
@@ -50513,20 +50558,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements674 = null;
+         var p_Statements661 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1956:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1956:11: p_Statements[false]
+            // xquery/XQueryParser.g:1958:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1958:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr15963);
-            p_Statements674=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr16011);
+            p_Statements661=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements674.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements661.getTree());
 
 
 
@@ -50563,7 +50608,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1960:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1962:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndOptionalExpr"
     p_StatementsAndOptionalExpr: function() {
         var retval = new XQueryParser.p_StatementsAndOptionalExpr_return();
@@ -50571,20 +50616,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements675 = null;
+         var p_Statements662 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1961:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1961:11: p_Statements[false]
+            // xquery/XQueryParser.g:1963:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1963:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990);
-            p_Statements675=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038);
+            p_Statements662=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements675.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements662.getTree());
 
 
 
@@ -50621,7 +50666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
+    // xquery/XQueryParser.g:1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
     // $ANTLR start "p_Hybrid"
     p_Hybrid: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Hybrid_return();
@@ -50629,38 +50674,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_HybridExprSingle676 = null;
-         var p_Statement677 = null;
+         var p_HybridExprSingle663 = null;
+         var p_Statement664 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1965:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
+            // xquery/XQueryParser.g:1967:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
             var alt237=2;
             alt237 = this.dfa237.predict(this.input);
             switch (alt237) {
                 case 1 :
-                    // xquery/XQueryParser.g:1965:11: p_HybridExprSingle[$strict,$allowConcat]
+                    // xquery/XQueryParser.g:1967:11: p_HybridExprSingle[$strict,$allowConcat]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16017);
-                    p_HybridExprSingle676=this.p_HybridExprSingle(strict, allowConcat);
+                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16065);
+                    p_HybridExprSingle663=this.p_HybridExprSingle(strict, allowConcat);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle676.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle663.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1966:11: p_Statement
+                    // xquery/XQueryParser.g:1968:11: p_Statement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16030);
-                    p_Statement677=this.p_Statement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16078);
+                    p_Statement664=this.p_Statement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement677.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement664.getTree());
 
 
                     break;
@@ -50705,7 +50750,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1982:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
+    // xquery/XQueryParser.g:1984:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
     // $ANTLR start "p_Statement"
     p_Statement: function() {
         var retval = new XQueryParser.p_Statement_return();
@@ -50713,16 +50758,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AssignStatement678 = null;
-         var p_BreakStatement679 = null;
-         var p_ContinueStatement680 = null;
-         var p_ExitStatement681 = null;
-         var p_VarDeclStatement682 = null;
-         var p_WhileStatement683 = null;
+         var p_AssignStatement665 = null;
+         var p_BreakStatement666 = null;
+         var p_ContinueStatement667 = null;
+         var p_ExitStatement668 = null;
+         var p_VarDeclStatement669 = null;
+         var p_WhileStatement670 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1983:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
+            // xquery/XQueryParser.g:1985:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
             var alt238=6;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -50754,80 +50799,80 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt238) {
                 case 1 :
-                    // xquery/XQueryParser.g:1983:11: p_AssignStatement
+                    // xquery/XQueryParser.g:1985:11: p_AssignStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16061);
-                    p_AssignStatement678=this.p_AssignStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16109);
+                    p_AssignStatement665=this.p_AssignStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement678.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement665.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1984:11: p_BreakStatement
+                    // xquery/XQueryParser.g:1986:11: p_BreakStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16073);
-                    p_BreakStatement679=this.p_BreakStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16121);
+                    p_BreakStatement666=this.p_BreakStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement679.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement666.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1985:11: p_ContinueStatement
+                    // xquery/XQueryParser.g:1987:11: p_ContinueStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16085);
-                    p_ContinueStatement680=this.p_ContinueStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16133);
+                    p_ContinueStatement667=this.p_ContinueStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement680.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement667.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1986:11: p_ExitStatement
+                    // xquery/XQueryParser.g:1988:11: p_ExitStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16097);
-                    p_ExitStatement681=this.p_ExitStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16145);
+                    p_ExitStatement668=this.p_ExitStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement681.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement668.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1987:11: p_VarDeclStatement
+                    // xquery/XQueryParser.g:1989:11: p_VarDeclStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16109);
-                    p_VarDeclStatement682=this.p_VarDeclStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16157);
+                    p_VarDeclStatement669=this.p_VarDeclStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement682.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement669.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1988:11: p_WhileStatement
+                    // xquery/XQueryParser.g:1990:11: p_WhileStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16121);
-                    p_WhileStatement683=this.p_WhileStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16169);
+                    p_WhileStatement670=this.p_WhileStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement683.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement670.getTree());
 
 
                     break;
@@ -50866,7 +50911,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1990:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
+    // xquery/XQueryParser.g:1992:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
     // $ANTLR start "p_HybridExprSingle"
     p_HybridExprSingle: function(strict, allowConcat) {
         var retval = new XQueryParser.p_HybridExprSingle_return();
@@ -50874,17 +50919,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON684 = null;
+        var SEMICOLON671 = null;
          var e = null;
 
-        var SEMICOLON684_tree=null;
+        var SEMICOLON671_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1991:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
-            // xquery/XQueryParser.g:1991:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
+            // xquery/XQueryParser.g:1993:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
+            // xquery/XQueryParser.g:1993:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16148);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16196);
             e=this.p_Expr(strict, allowConcat);
 
             this.state._fsp--;
@@ -50893,10 +50938,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (strict || this.input.LT(1).getType() != SEMICOLON) throw new org.antlr.runtime.RecognitionException(this.input); 
             }
-            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16163); if (this.state.failed) return retval;
+            SEMICOLON671=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16211); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
-            this.adaptor.addChild(root_0, SEMICOLON684_tree);
+            SEMICOLON671_tree = this.adaptor.create(SEMICOLON671);
+            this.adaptor.addChild(root_0, SEMICOLON671_tree);
             }
 
 
@@ -50939,7 +50984,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2026:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
+    // xquery/XQueryParser.g:2028:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
     // $ANTLR start "p_ApplyStatement"
     p_ApplyStatement: function() {
         var retval = new XQueryParser.p_ApplyStatement_return();
@@ -50947,26 +50992,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON686 = null;
-         var p_ExprSimple685 = null;
+        var SEMICOLON673 = null;
+         var p_ExprSimple672 = null;
 
-        var SEMICOLON686_tree=null;
+        var SEMICOLON673_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2027:9: ( p_ExprSimple SEMICOLON )
-            // xquery/XQueryParser.g:2027:11: p_ExprSimple SEMICOLON
+            // xquery/XQueryParser.g:2029:9: ( p_ExprSimple SEMICOLON )
+            // xquery/XQueryParser.g:2029:11: p_ExprSimple SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16213);
-            p_ExprSimple685=this.p_ExprSimple();
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16261);
+            p_ExprSimple672=this.p_ExprSimple();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple685.getTree());
-            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16215); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple672.getTree());
+            SEMICOLON673=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16263); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
-            this.adaptor.addChild(root_0, SEMICOLON686_tree);
+            SEMICOLON673_tree = this.adaptor.create(SEMICOLON673);
+            this.adaptor.addChild(root_0, SEMICOLON673_tree);
             }
 
 
@@ -51004,7 +51049,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2031:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2033:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_AssignStatement"
     p_AssignStatement: function() {
         var retval = new XQueryParser.p_AssignStatement_return();
@@ -51013,26 +51058,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND687 = null;
-        var SEMICOLON689 = null;
+        var BIND674 = null;
+        var SEMICOLON676 = null;
          var v = null;
-         var p_ExprSingle688 = null;
+         var p_ExprSingle675 = null;
 
         var d_tree=null;
-        var BIND687_tree=null;
-        var SEMICOLON689_tree=null;
+        var BIND674_tree=null;
+        var SEMICOLON676_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2032:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2032:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2034:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2034:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16243); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16291); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16247);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16295);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -51041,21 +51086,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND687=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16251); if (this.state.failed) return retval;
+            BIND674=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16299); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND687_tree = this.adaptor.create(BIND687);
-            this.adaptor.addChild(root_0, BIND687_tree);
+            BIND674_tree = this.adaptor.create(BIND674);
+            this.adaptor.addChild(root_0, BIND674_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16253);
-            p_ExprSingle688=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16301);
+            p_ExprSingle675=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle688.getTree());
-            SEMICOLON689=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16256); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle675.getTree());
+            SEMICOLON676=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16304); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON689_tree = this.adaptor.create(SEMICOLON689);
-            this.adaptor.addChild(root_0, SEMICOLON689_tree);
+            SEMICOLON676_tree = this.adaptor.create(SEMICOLON676);
+            this.adaptor.addChild(root_0, SEMICOLON676_tree);
             }
 
 
@@ -51093,7 +51138,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2036:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
+    // xquery/XQueryParser.g:2038:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
     // $ANTLR start "p_BlockStatement"
     p_BlockStatement: function() {
         var retval = new XQueryParser.p_BlockStatement_return();
@@ -51101,33 +51146,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET690 = null;
-        var RBRACKET692 = null;
-         var p_Statements691 = null;
+        var LBRACKET677 = null;
+        var RBRACKET679 = null;
+         var p_Statements678 = null;
 
-        var LBRACKET690_tree=null;
-        var RBRACKET692_tree=null;
+        var LBRACKET677_tree=null;
+        var RBRACKET679_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2037:9: ( LBRACKET p_Statements[false] RBRACKET )
-            // xquery/XQueryParser.g:2037:11: LBRACKET p_Statements[false] RBRACKET
+            // xquery/XQueryParser.g:2039:9: ( LBRACKET p_Statements[false] RBRACKET )
+            // xquery/XQueryParser.g:2039:11: LBRACKET p_Statements[false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET690=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16282); if (this.state.failed) return retval;
+            LBRACKET677=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16330); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET690_tree = this.adaptor.create(LBRACKET690);
-            this.adaptor.addChild(root_0, LBRACKET690_tree);
+            LBRACKET677_tree = this.adaptor.create(LBRACKET677);
+            this.adaptor.addChild(root_0, LBRACKET677_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16284);
-            p_Statements691=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16332);
+            p_Statements678=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements691.getTree());
-            RBRACKET692=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16287); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements678.getTree());
+            RBRACKET679=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16335); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET692_tree = this.adaptor.create(RBRACKET692);
-            this.adaptor.addChild(root_0, RBRACKET692_tree);
+            RBRACKET679_tree = this.adaptor.create(RBRACKET679);
+            this.adaptor.addChild(root_0, RBRACKET679_tree);
             }
 
 
@@ -51165,7 +51210,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2040:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
+    // xquery/XQueryParser.g:2042:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
     // $ANTLR start "p_BlockHybrid"
     p_BlockHybrid: function(strict) {
         var retval = new XQueryParser.p_BlockHybrid_return();
@@ -51173,33 +51218,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET693 = null;
-        var RBRACKET695 = null;
-         var p_Statements694 = null;
+        var LBRACKET680 = null;
+        var RBRACKET682 = null;
+         var p_Statements681 = null;
 
-        var LBRACKET693_tree=null;
-        var RBRACKET695_tree=null;
+        var LBRACKET680_tree=null;
+        var RBRACKET682_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2041:9: ( LBRACKET p_Statements[$strict] RBRACKET )
-            // xquery/XQueryParser.g:2041:11: LBRACKET p_Statements[$strict] RBRACKET
+            // xquery/XQueryParser.g:2043:9: ( LBRACKET p_Statements[$strict] RBRACKET )
+            // xquery/XQueryParser.g:2043:11: LBRACKET p_Statements[$strict] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET693=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16313); if (this.state.failed) return retval;
+            LBRACKET680=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16361); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET693_tree = this.adaptor.create(LBRACKET693);
-            this.adaptor.addChild(root_0, LBRACKET693_tree);
+            LBRACKET680_tree = this.adaptor.create(LBRACKET680);
+            this.adaptor.addChild(root_0, LBRACKET680_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16315);
-            p_Statements694=this.p_Statements(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16363);
+            p_Statements681=this.p_Statements(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements694.getTree());
-            RBRACKET695=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16318); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements681.getTree());
+            RBRACKET682=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16366); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET695_tree = this.adaptor.create(RBRACKET695);
-            this.adaptor.addChild(root_0, RBRACKET695_tree);
+            RBRACKET682_tree = this.adaptor.create(RBRACKET682);
+            this.adaptor.addChild(root_0, RBRACKET682_tree);
             }
 
 
@@ -51237,7 +51282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2045:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2047:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
     // $ANTLR start "p_BreakStatement"
     p_BreakStatement: function() {
         var retval = new XQueryParser.p_BreakStatement_return();
@@ -51246,17 +51291,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON696 = null;
+        var SEMICOLON683 = null;
 
         var k_tree=null;
-        var SEMICOLON696_tree=null;
+        var SEMICOLON683_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2046:9: (k= BREAK k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2046:11: k= BREAK k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2048:9: (k= BREAK k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2048:11: k= BREAK k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16346); if (this.state.failed) return retval;
+            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16394); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51264,7 +51309,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16352); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16400); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51272,10 +51317,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON696=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16356); if (this.state.failed) return retval;
+            SEMICOLON683=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16404); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON696_tree = this.adaptor.create(SEMICOLON696);
-            this.adaptor.addChild(root_0, SEMICOLON696_tree);
+            SEMICOLON683_tree = this.adaptor.create(SEMICOLON683);
+            this.adaptor.addChild(root_0, SEMICOLON683_tree);
             }
 
 
@@ -51313,7 +51358,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2050:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2052:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
     // $ANTLR start "p_ContinueStatement"
     p_ContinueStatement: function() {
         var retval = new XQueryParser.p_ContinueStatement_return();
@@ -51322,17 +51367,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON697 = null;
+        var SEMICOLON684 = null;
 
         var k_tree=null;
-        var SEMICOLON697_tree=null;
+        var SEMICOLON684_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2051:9: (k= CONTINUE k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2051:11: k= CONTINUE k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2053:9: (k= CONTINUE k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2053:11: k= CONTINUE k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16384); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51340,7 +51385,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16390); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16438); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51348,10 +51393,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON697=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16394); if (this.state.failed) return retval;
+            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16442); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON697_tree = this.adaptor.create(SEMICOLON697);
-            this.adaptor.addChild(root_0, SEMICOLON697_tree);
+            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
+            this.adaptor.addChild(root_0, SEMICOLON684_tree);
             }
 
 
@@ -51389,7 +51434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2055:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2057:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_ExitStatement"
     p_ExitStatement: function() {
         var retval = new XQueryParser.p_ExitStatement_return();
@@ -51398,18 +51443,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON699 = null;
-         var p_ExprSingle698 = null;
+        var SEMICOLON686 = null;
+         var p_ExprSingle685 = null;
 
         var k_tree=null;
-        var SEMICOLON699_tree=null;
+        var SEMICOLON686_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2056:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2056:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2058:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2058:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16422); if (this.state.failed) return retval;
+            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51417,7 +51462,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16428); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51425,16 +51470,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16432);
-            p_ExprSingle698=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16480);
+            p_ExprSingle685=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle698.getTree());
-            SEMICOLON699=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16435); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle685.getTree());
+            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16483); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON699_tree = this.adaptor.create(SEMICOLON699);
-            this.adaptor.addChild(root_0, SEMICOLON699_tree);
+            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
+            this.adaptor.addChild(root_0, SEMICOLON686_tree);
             }
 
 
@@ -51472,7 +51517,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2060:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
+    // xquery/XQueryParser.g:2062:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
     // $ANTLR start "p_FLWORStatement"
     p_FLWORStatement: function() {
         var retval = new XQueryParser.p_FLWORStatement_return();
@@ -51480,23 +51525,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InitialClause700 = null;
-         var p_IntermediateClause701 = null;
-         var p_ReturnStatement702 = null;
+         var p_InitialClause687 = null;
+         var p_IntermediateClause688 = null;
+         var p_ReturnStatement689 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2061:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
-            // xquery/XQueryParser.g:2061:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
+            // xquery/XQueryParser.g:2063:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
+            // xquery/XQueryParser.g:2063:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16461);
-            p_InitialClause700=this.p_InitialClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16509);
+            p_InitialClause687=this.p_InitialClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause700.getTree());
-            // xquery/XQueryParser.g:2061:27: ( p_IntermediateClause )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause687.getTree());
+            // xquery/XQueryParser.g:2063:27: ( p_IntermediateClause )*
             loop239:
             do {
                 var alt239=2;
@@ -51509,13 +51554,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt239) {
                 case 1 :
-                    // xquery/XQueryParser.g:2061:27: p_IntermediateClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463);
-                    p_IntermediateClause701=this.p_IntermediateClause();
+                    // xquery/XQueryParser.g:2063:27: p_IntermediateClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511);
+                    p_IntermediateClause688=this.p_IntermediateClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause701.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause688.getTree());
 
 
                     break;
@@ -51525,12 +51570,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466);
-            p_ReturnStatement702=this.p_ReturnStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514);
+            p_ReturnStatement689=this.p_ReturnStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement702.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement689.getTree());
 
 
 
@@ -51567,7 +51612,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2065:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2067:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_ReturnStatement"
     p_ReturnStatement: function() {
         var retval = new XQueryParser.p_ReturnStatement_return();
@@ -51576,16 +51621,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid703 = null;
+         var p_Hybrid690 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2066:9: (k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2066:11: k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2068:9: (k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2068:11: k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16498); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16546); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51593,12 +51638,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16502);
-            p_Hybrid703=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16550);
+            p_Hybrid690=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid703.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid690.getTree());
 
 
 
@@ -51635,7 +51680,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2070:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2072:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
     // $ANTLR start "p_IfStatement"
     p_IfStatement: function() {
         var retval = new XQueryParser.p_IfStatement_return();
@@ -51644,22 +51689,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN704 = null;
-        var RPAREN706 = null;
-         var p_Expr705 = null;
-         var p_Hybrid707 = null;
-         var p_Hybrid708 = null;
+        var LPAREN691 = null;
+        var RPAREN693 = null;
+         var p_Expr692 = null;
+         var p_Hybrid694 = null;
+         var p_Hybrid695 = null;
 
         var k_tree=null;
-        var LPAREN704_tree=null;
-        var RPAREN706_tree=null;
+        var LPAREN691_tree=null;
+        var RPAREN693_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2071:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2071:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2073:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2073:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16531); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16579); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51667,23 +51712,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN704=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16535); if (this.state.failed) return retval;
+            LPAREN691=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16583); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN704_tree = this.adaptor.create(LPAREN704);
-            this.adaptor.addChild(root_0, LPAREN704_tree);
+            LPAREN691_tree = this.adaptor.create(LPAREN691);
+            this.adaptor.addChild(root_0, LPAREN691_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16537);
-            p_Expr705=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16585);
+            p_Expr692=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr705.getTree());
-            RPAREN706=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16540); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr692.getTree());
+            RPAREN693=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16588); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN706_tree = this.adaptor.create(RPAREN706);
-            this.adaptor.addChild(root_0, RPAREN706_tree);
+            RPAREN693_tree = this.adaptor.create(RPAREN693);
+            this.adaptor.addChild(root_0, RPAREN693_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16544); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16592); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51691,13 +51736,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16548);
-            p_Hybrid707=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16596);
+            p_Hybrid694=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid707.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16553); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid694.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16601); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51705,12 +51750,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16557);
-            p_Hybrid708=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16605);
+            p_Hybrid695=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid708.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid695.getTree());
 
 
 
@@ -51747,7 +51792,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2075:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2077:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchStatement"
     p_SwitchStatement: function() {
         var retval = new XQueryParser.p_SwitchStatement_return();
@@ -51756,22 +51801,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN709 = null;
-        var RPAREN711 = null;
-         var p_Expr710 = null;
-         var p_SwitchCaseStatement712 = null;
-         var p_Hybrid713 = null;
+        var LPAREN696 = null;
+        var RPAREN698 = null;
+         var p_Expr697 = null;
+         var p_SwitchCaseStatement699 = null;
+         var p_Hybrid700 = null;
 
         var k_tree=null;
-        var LPAREN709_tree=null;
-        var RPAREN711_tree=null;
+        var LPAREN696_tree=null;
+        var RPAREN698_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2076:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2076:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2078:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2078:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16586); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16634); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51779,23 +51824,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16590); if (this.state.failed) return retval;
+            LPAREN696=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16638); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN709_tree = this.adaptor.create(LPAREN709);
-            this.adaptor.addChild(root_0, LPAREN709_tree);
+            LPAREN696_tree = this.adaptor.create(LPAREN696);
+            this.adaptor.addChild(root_0, LPAREN696_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16592);
-            p_Expr710=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16640);
+            p_Expr697=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
-            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16595); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr697.getTree());
+            RPAREN698=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16643); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN711_tree = this.adaptor.create(RPAREN711);
-            this.adaptor.addChild(root_0, RPAREN711_tree);
+            RPAREN698_tree = this.adaptor.create(RPAREN698);
+            this.adaptor.addChild(root_0, RPAREN698_tree);
             }
-            // xquery/XQueryParser.g:2076:67: ( p_SwitchCaseStatement )+
+            // xquery/XQueryParser.g:2078:67: ( p_SwitchCaseStatement )+
             var cnt240=0;
             loop240:
             do {
@@ -51809,13 +51854,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt240) {
                 case 1 :
-                    // xquery/XQueryParser.g:2076:67: p_SwitchCaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597);
-                    p_SwitchCaseStatement712=this.p_SwitchCaseStatement();
+                    // xquery/XQueryParser.g:2078:67: p_SwitchCaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645);
+                    p_SwitchCaseStatement699=this.p_SwitchCaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement712.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement699.getTree());
 
 
                     break;
@@ -51831,7 +51876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt240++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16602); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51839,7 +51884,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16608); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16656); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51847,12 +51892,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16612);
-            p_Hybrid713=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16660);
+            p_Hybrid700=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid700.getTree());
 
 
 
@@ -51889,7 +51934,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2080:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2082:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchCaseStatement"
     p_SwitchCaseStatement: function() {
         var retval = new XQueryParser.p_SwitchCaseStatement_return();
@@ -51898,17 +51943,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand714 = null;
-         var p_Hybrid715 = null;
+         var p_SwitchCaseOperand701 = null;
+         var p_Hybrid702 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2081:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2083:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+
             var cnt241=0;
             loop241:
             do {
@@ -51922,8 +51967,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt241) {
                 case 1 :
-                    // xquery/XQueryParser.g:2081:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16642); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2083:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16690); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -51931,12 +51976,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646);
-                    p_SwitchCaseOperand714=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694);
+                    p_SwitchCaseOperand701=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand714.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand701.getTree());
 
 
                     break;
@@ -51952,7 +51997,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt241++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16652); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -51960,12 +52005,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656);
-            p_Hybrid715=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704);
+            p_Hybrid702=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid715.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid702.getTree());
 
 
 
@@ -52002,7 +52047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2085:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
+    // xquery/XQueryParser.g:2087:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
     // $ANTLR start "p_TryCatchStatement"
     p_TryCatchStatement: function() {
         var retval = new XQueryParser.p_TryCatchStatement_return();
@@ -52011,18 +52056,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockStatement716 = null;
-         var p_CatchErrorList717 = null;
-         var p_BlockStatement718 = null;
+         var p_BlockStatement703 = null;
+         var p_CatchErrorList704 = null;
+         var p_BlockStatement705 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2086:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
-            // xquery/XQueryParser.g:2086:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
+            // xquery/XQueryParser.g:2088:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
+            // xquery/XQueryParser.g:2088:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16685); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52030,13 +52075,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689);
-            p_BlockStatement716=this.p_BlockStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737);
+            p_BlockStatement703=this.p_BlockStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement716.getTree());
-            // xquery/XQueryParser.g:2086:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement703.getTree());
+            // xquery/XQueryParser.g:2088:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
             var cnt242=0;
             loop242:
             do {
@@ -52050,8 +52095,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt242) {
                 case 1 :
-                    // xquery/XQueryParser.g:2086:50: k= CATCH p_CatchErrorList p_BlockStatement
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16694); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2088:50: k= CATCH p_CatchErrorList p_BlockStatement
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16742); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -52059,18 +52104,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698);
-                    p_CatchErrorList717=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746);
+                    p_CatchErrorList704=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList717.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700);
-                    p_BlockStatement718=this.p_BlockStatement();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList704.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748);
+                    p_BlockStatement705=this.p_BlockStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement718.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement705.getTree());
 
 
                     break;
@@ -52125,7 +52170,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2089:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
+    // xquery/XQueryParser.g:2091:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
     // $ANTLR start "p_TryCatchHybrid"
     p_TryCatchHybrid: function(strict) {
         var retval = new XQueryParser.p_TryCatchHybrid_return();
@@ -52134,18 +52179,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockHybrid719 = null;
-         var p_CatchErrorList720 = null;
-         var p_BlockHybrid721 = null;
+         var p_BlockHybrid706 = null;
+         var p_CatchErrorList707 = null;
+         var p_BlockHybrid708 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2090:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
-            // xquery/XQueryParser.g:2090:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            // xquery/XQueryParser.g:2092:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
+            // xquery/XQueryParser.g:2092:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16732); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16780); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52153,13 +52198,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736);
-            p_BlockHybrid719=this.p_BlockHybrid(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784);
+            p_BlockHybrid706=this.p_BlockHybrid(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid719.getTree());
-            // xquery/XQueryParser.g:2090:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid706.getTree());
+            // xquery/XQueryParser.g:2092:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             var cnt243=0;
             loop243:
             do {
@@ -52173,8 +52218,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt243) {
                 case 1 :
-                    // xquery/XQueryParser.g:2090:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16742); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2092:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16790); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -52182,18 +52227,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746);
-                    p_CatchErrorList720=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794);
+                    p_CatchErrorList707=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList720.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748);
-                    p_BlockHybrid721=this.p_BlockHybrid(strict);
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList707.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796);
+                    p_BlockHybrid708=this.p_BlockHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid721.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid708.getTree());
 
 
                     break;
@@ -52248,7 +52293,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2094:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2096:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_TypeswitchStatement"
     p_TypeswitchStatement: function() {
         var retval = new XQueryParser.p_TypeswitchStatement_return();
@@ -52258,24 +52303,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN722 = null;
-        var RPAREN724 = null;
+        var LPAREN709 = null;
+        var RPAREN711 = null;
          var v = null;
-         var p_Expr723 = null;
-         var p_CaseStatement725 = null;
-         var p_Hybrid726 = null;
+         var p_Expr710 = null;
+         var p_CaseStatement712 = null;
+         var p_Hybrid713 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN722_tree=null;
-        var RPAREN724_tree=null;
+        var LPAREN709_tree=null;
+        var RPAREN711_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2095:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2095:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2097:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2097:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52283,23 +52328,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN722=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16785); if (this.state.failed) return retval;
+            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16833); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN722_tree = this.adaptor.create(LPAREN722);
-            this.adaptor.addChild(root_0, LPAREN722_tree);
+            LPAREN709_tree = this.adaptor.create(LPAREN709);
+            this.adaptor.addChild(root_0, LPAREN709_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16787);
-            p_Expr723=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16835);
+            p_Expr710=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr723.getTree());
-            RPAREN724=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16790); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
+            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16838); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN724_tree = this.adaptor.create(RPAREN724);
-            this.adaptor.addChild(root_0, RPAREN724_tree);
+            RPAREN711_tree = this.adaptor.create(RPAREN711);
+            this.adaptor.addChild(root_0, RPAREN711_tree);
             }
-            // xquery/XQueryParser.g:2095:71: ( p_CaseStatement )+
+            // xquery/XQueryParser.g:2097:71: ( p_CaseStatement )+
             var cnt244=0;
             loop244:
             do {
@@ -52313,13 +52358,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt244) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:71: p_CaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792);
-                    p_CaseStatement725=this.p_CaseStatement();
+                    // xquery/XQueryParser.g:2097:71: p_CaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840);
+                    p_CaseStatement712=this.p_CaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement725.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement712.getTree());
 
 
                     break;
@@ -52335,7 +52380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt244++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16797); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16845); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52343,7 +52388,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2095:113: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:2097:113: (d= DOLLAR v= p_VarName )?
             var alt245=2;
             var LA245_0 = this.input.LA(1);
 
@@ -52352,13 +52397,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt245) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:114: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16804); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2097:114: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16852); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16808);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16856);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -52373,7 +52418,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16816); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16864); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52381,12 +52426,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820);
-            p_Hybrid726=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868);
+            p_Hybrid713=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid726.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
 
 
 
@@ -52423,7 +52468,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2099:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2101:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_CaseStatement"
     p_CaseStatement: function() {
         var retval = new XQueryParser.p_CaseStatement_return();
@@ -52433,21 +52478,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var AS727 = null;
+        var AS714 = null;
          var v = null;
-         var p_SequenceType728 = null;
-         var p_Hybrid729 = null;
+         var p_SequenceType715 = null;
+         var p_Hybrid716 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var AS727_tree=null;
+        var AS714_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2100:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2100:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2102:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2102:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16849); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16897); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52455,7 +52500,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2100:33: (d= DOLLAR v= p_VarName AS )?
+            // xquery/XQueryParser.g:2102:33: (d= DOLLAR v= p_VarName AS )?
             var alt246=2;
             var LA246_0 = this.input.LA(1);
 
@@ -52464,13 +52509,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt246) {
                 case 1 :
-                    // xquery/XQueryParser.g:2100:34: d= DOLLAR v= p_VarName AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16856); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2102:34: d= DOLLAR v= p_VarName AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16904); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16860);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16908);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -52479,10 +52524,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    AS727=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16864); if (this.state.failed) return retval;
+                    AS714=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16912); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    AS727_tree = this.adaptor.create(AS727);
-                    this.adaptor.addChild(root_0, AS727_tree);
+                    AS714_tree = this.adaptor.create(AS714);
+                    this.adaptor.addChild(root_0, AS714_tree);
                     }
 
 
@@ -52490,13 +52535,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16868);
-            p_SequenceType728=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16916);
+            p_SequenceType715=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType728.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16872); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType715.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52504,12 +52549,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16876);
-            p_Hybrid729=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16924);
+            p_Hybrid716=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid716.getTree());
 
 
 
@@ -52546,7 +52591,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2104:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
+    // xquery/XQueryParser.g:2106:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
     // $ANTLR start "p_VarDeclStatement"
     p_VarDeclStatement: function() {
         var retval = new XQueryParser.p_VarDeclStatement_return();
@@ -52557,32 +52602,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var BIND732 = null;
-        var COMMA734 = null;
-        var BIND736 = null;
-        var SEMICOLON738 = null;
+        var BIND719 = null;
+        var COMMA721 = null;
+        var BIND723 = null;
+        var SEMICOLON725 = null;
          var v = null;
          var w = null;
-         var p_Annotation730 = null;
-         var p_TypeDeclaration731 = null;
-         var p_ExprSingle733 = null;
-         var p_TypeDeclaration735 = null;
-         var p_ExprSingle737 = null;
+         var p_Annotation717 = null;
+         var p_TypeDeclaration718 = null;
+         var p_ExprSingle720 = null;
+         var p_TypeDeclaration722 = null;
+         var p_ExprSingle724 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var BIND732_tree=null;
-        var COMMA734_tree=null;
-        var BIND736_tree=null;
-        var SEMICOLON738_tree=null;
+        var BIND719_tree=null;
+        var COMMA721_tree=null;
+        var BIND723_tree=null;
+        var SEMICOLON725_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2105:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
+            // xquery/XQueryParser.g:2107:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )*
             loop247:
             do {
                 var alt247=2;
@@ -52595,13 +52640,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt247) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16903);
-                    p_Annotation730=this.p_Annotation();
+                    // xquery/XQueryParser.g:2107:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16951);
+                    p_Annotation717=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation730.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation717.getTree());
 
 
                     break;
@@ -52611,7 +52656,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16908); if (this.state.failed) return retval;
+            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16956); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52619,12 +52664,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16914); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16962); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16918);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16966);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -52633,7 +52678,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:2105:98: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:2107:98: ( p_TypeDeclaration )?
             var alt248=2;
             var LA248_0 = this.input.LA(1);
 
@@ -52642,20 +52687,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt248) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:98: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922);
-                    p_TypeDeclaration731=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:2107:98: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970);
+                    p_TypeDeclaration718=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration731.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration718.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2105:117: ( BIND p_ExprSingle[true] )?
+            // xquery/XQueryParser.g:2107:117: ( BIND p_ExprSingle[true] )?
             var alt249=2;
             var LA249_0 = this.input.LA(1);
 
@@ -52664,25 +52709,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt249) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:118: BIND p_ExprSingle[true]
-                    BIND732=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2107:118: BIND p_ExprSingle[true]
+                    BIND719=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND732_tree = this.adaptor.create(BIND732);
-                    this.adaptor.addChild(root_0, BIND732_tree);
+                    BIND719_tree = this.adaptor.create(BIND719);
+                    this.adaptor.addChild(root_0, BIND719_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928);
-                    p_ExprSingle733=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976);
+                    p_ExprSingle720=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle733.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle720.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2106:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
+            // xquery/XQueryParser.g:2108:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
             loop252:
             do {
                 var alt252=2;
@@ -52695,18 +52740,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt252) {
                 case 1 :
-                    // xquery/XQueryParser.g:2106:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
-                    COMMA734=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16944); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2108:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
+                    COMMA721=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA734_tree = this.adaptor.create(COMMA734);
-                    this.adaptor.addChild(root_0, COMMA734_tree);
+                    COMMA721_tree = this.adaptor.create(COMMA721);
+                    this.adaptor.addChild(root_0, COMMA721_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16948); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16952);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement17000);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -52715,7 +52760,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    // xquery/XQueryParser.g:2106:65: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:2108:65: ( p_TypeDeclaration )?
                     var alt250=2;
                     var LA250_0 = this.input.LA(1);
 
@@ -52724,20 +52769,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt250) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:65: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956);
-                            p_TypeDeclaration735=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:2108:65: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004);
+                            p_TypeDeclaration722=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration735.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration722.getTree());
 
 
                             break;
 
                     }
 
-                    // xquery/XQueryParser.g:2106:84: ( BIND p_ExprSingle[true] )?
+                    // xquery/XQueryParser.g:2108:84: ( BIND p_ExprSingle[true] )?
                     var alt251=2;
                     var LA251_0 = this.input.LA(1);
 
@@ -52746,18 +52791,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt251) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:85: BIND p_ExprSingle[true]
-                            BIND736=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16960); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:2108:85: BIND p_ExprSingle[true]
+                            BIND723=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement17008); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            BIND736_tree = this.adaptor.create(BIND736);
-                            this.adaptor.addChild(root_0, BIND736_tree);
+                            BIND723_tree = this.adaptor.create(BIND723);
+                            this.adaptor.addChild(root_0, BIND723_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962);
-                            p_ExprSingle737=this.p_ExprSingle(true);
+                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010);
+                            p_ExprSingle724=this.p_ExprSingle(true);
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle737.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle724.getTree());
 
 
                             break;
@@ -52773,10 +52818,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            SEMICOLON738=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement16979); if (this.state.failed) return retval;
+            SEMICOLON725=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement17027); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON738_tree = this.adaptor.create(SEMICOLON738);
-            this.adaptor.addChild(root_0, SEMICOLON738_tree);
+            SEMICOLON725_tree = this.adaptor.create(SEMICOLON725);
+            this.adaptor.addChild(root_0, SEMICOLON725_tree);
             }
 
 
@@ -52814,7 +52859,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2111:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2113:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
     // $ANTLR start "p_WhileStatement"
     p_WhileStatement: function() {
         var retval = new XQueryParser.p_WhileStatement_return();
@@ -52823,21 +52868,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN739 = null;
-        var RPAREN741 = null;
-         var p_Expr740 = null;
-         var p_Hybrid742 = null;
+        var LPAREN726 = null;
+        var RPAREN728 = null;
+         var p_Expr727 = null;
+         var p_Hybrid729 = null;
 
         var k_tree=null;
-        var LPAREN739_tree=null;
-        var RPAREN741_tree=null;
+        var LPAREN726_tree=null;
+        var RPAREN728_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2112:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2112:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2114:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2114:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17007); if (this.state.failed) return retval;
+            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17055); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -52845,28 +52890,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN739=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17011); if (this.state.failed) return retval;
+            LPAREN726=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17059); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN739_tree = this.adaptor.create(LPAREN739);
-            this.adaptor.addChild(root_0, LPAREN739_tree);
+            LPAREN726_tree = this.adaptor.create(LPAREN726);
+            this.adaptor.addChild(root_0, LPAREN726_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17013);
-            p_Expr740=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17061);
+            p_Expr727=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr740.getTree());
-            RPAREN741=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17016); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr727.getTree());
+            RPAREN728=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17064); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN741_tree = this.adaptor.create(RPAREN741);
-            this.adaptor.addChild(root_0, RPAREN741_tree);
+            RPAREN728_tree = this.adaptor.create(RPAREN728);
+            this.adaptor.addChild(root_0, RPAREN728_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17018);
-            p_Hybrid742=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17066);
+            p_Hybrid729=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid742.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
 
 
 
@@ -52903,7 +52948,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
+    // xquery/XQueryParser.g:2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
     // $ANTLR start "p_ExprSimple"
     p_ExprSimple: function() {
         var retval = new XQueryParser.p_ExprSimple_return();
@@ -52911,56 +52956,56 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuantifiedExpr743 = null;
-         var p_OrExpr744 = null;
-         var pg_UpdateExpr745 = null;
+         var p_QuantifiedExpr730 = null;
+         var p_OrExpr731 = null;
+         var pg_UpdateExpr732 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2117:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
+            // xquery/XQueryParser.g:2119:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
             var alt253=3;
             alt253 = this.dfa253.predict(this.input);
             switch (alt253) {
                 case 1 :
-                    // xquery/XQueryParser.g:2117:11: p_QuantifiedExpr
+                    // xquery/XQueryParser.g:2119:11: p_QuantifiedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045);
-                    p_QuantifiedExpr743=this.p_QuantifiedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093);
+                    p_QuantifiedExpr730=this.p_QuantifiedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr743.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr730.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2118:11: p_OrExpr
+                    // xquery/XQueryParser.g:2120:11: p_OrExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17057);
-                    p_OrExpr744=this.p_OrExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17105);
+                    p_OrExpr731=this.p_OrExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr744.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr731.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2119:11: {...}? => pg_UpdateExpr
+                    // xquery/XQueryParser.g:2121:11: {...}? => pg_UpdateExpr
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ExprSimple", "this.lc(XQU)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072);
-                    pg_UpdateExpr745=this.pg_UpdateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120);
+                    pg_UpdateExpr732=this.pg_UpdateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr745.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr732.getTree());
 
 
                     break;
@@ -52999,7 +53044,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2123:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
+    // xquery/XQueryParser.g:2125:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
     // $ANTLR start "p_BlockExpr"
     p_BlockExpr: function() {
         var retval = new XQueryParser.p_BlockExpr_return();
@@ -53007,33 +53052,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET746 = null;
-        var RBRACKET748 = null;
-         var p_StatementsAndExpr747 = null;
+        var LBRACKET733 = null;
+        var RBRACKET735 = null;
+         var p_StatementsAndExpr734 = null;
 
-        var LBRACKET746_tree=null;
-        var RBRACKET748_tree=null;
+        var LBRACKET733_tree=null;
+        var RBRACKET735_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2124:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
-            // xquery/XQueryParser.g:2124:11: LBRACKET p_StatementsAndExpr RBRACKET
+            // xquery/XQueryParser.g:2126:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
+            // xquery/XQueryParser.g:2126:11: LBRACKET p_StatementsAndExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET746=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17098); if (this.state.failed) return retval;
+            LBRACKET733=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17146); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET746_tree = this.adaptor.create(LBRACKET746);
-            this.adaptor.addChild(root_0, LBRACKET746_tree);
+            LBRACKET733_tree = this.adaptor.create(LBRACKET733);
+            this.adaptor.addChild(root_0, LBRACKET733_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100);
-            p_StatementsAndExpr747=this.p_StatementsAndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148);
+            p_StatementsAndExpr734=this.p_StatementsAndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr747.getTree());
-            RBRACKET748=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17102); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr734.getTree());
+            RBRACKET735=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17150); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET748_tree = this.adaptor.create(RBRACKET748);
-            this.adaptor.addChild(root_0, RBRACKET748_tree);
+            RBRACKET735_tree = this.adaptor.create(RBRACKET735);
+            this.adaptor.addChild(root_0, RBRACKET735_tree);
             }
 
 
@@ -53071,7 +53116,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2131:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
+    // xquery/XQueryParser.g:2133:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
     // $ANTLR start "p_CollectionDecl"
     p_CollectionDecl: function() {
         var retval = new XQueryParser.p_CollectionDecl_return();
@@ -53080,17 +53125,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName749 = null;
-         var p_CollectionTypeDecl750 = null;
+         var p_QName736 = null;
+         var p_CollectionTypeDecl737 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2132:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
-            // xquery/XQueryParser.g:2132:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
+            // xquery/XQueryParser.g:2134:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
+            // xquery/XQueryParser.g:2134:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17133); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53098,13 +53143,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17137);
-            p_QName749=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17185);
+            p_QName736=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName749.getTree());
-            // xquery/XQueryParser.g:2132:47: ( p_CollectionTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName736.getTree());
+            // xquery/XQueryParser.g:2134:47: ( p_CollectionTypeDecl )?
             var alt254=2;
             var LA254_0 = this.input.LA(1);
 
@@ -53113,13 +53158,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt254) {
                 case 1 :
-                    // xquery/XQueryParser.g:2132:47: p_CollectionTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139);
-                    p_CollectionTypeDecl750=this.p_CollectionTypeDecl();
+                    // xquery/XQueryParser.g:2134:47: p_CollectionTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187);
+                    p_CollectionTypeDecl737=this.p_CollectionTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl750.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl737.getTree());
 
 
                     break;
@@ -53162,7 +53207,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2135:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
+    // xquery/XQueryParser.g:2137:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
     // $ANTLR start "p_CollectionTypeDecl"
     p_CollectionTypeDecl: function() {
         var retval = new XQueryParser.p_CollectionTypeDecl_return();
@@ -53171,19 +53216,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_KindTest751 = null;
-         var p_OccurrenceIndicator752 = null;
+         var p_KindTest738 = null;
+         var p_OccurrenceIndicator739 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2136:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2136:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17168); if (this.state.failed) return retval;
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53191,13 +53236,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172);
-            p_KindTest751=this.p_KindTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220);
+            p_KindTest738=this.p_KindTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest751.getTree());
-            // xquery/XQueryParser.g:2136:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest738.getTree());
+            // xquery/XQueryParser.g:2138:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
             var alt255=2;
             var LA255_0 = this.input.LA(1);
 
@@ -53206,13 +53251,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt255) {
                 case 1 :
-                    // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181);
-                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229);
+                    p_OccurrenceIndicator739=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator739.getTree());
 
 
                     break;
@@ -53258,7 +53303,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2139:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
+    // xquery/XQueryParser.g:2141:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
     // $ANTLR start "p_IndexDecl"
     p_IndexDecl: function() {
         var retval = new XQueryParser.p_IndexDecl_return();
@@ -53267,21 +53312,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA756 = null;
-         var p_IndexName753 = null;
-         var p_IndexDomainExpr754 = null;
-         var p_IndexKeySpec755 = null;
-         var p_IndexKeySpec757 = null;
+        var COMMA743 = null;
+         var p_IndexName740 = null;
+         var p_IndexDomainExpr741 = null;
+         var p_IndexKeySpec742 = null;
+         var p_IndexKeySpec744 = null;
 
         var k_tree=null;
-        var COMMA756_tree=null;
+        var COMMA743_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2140:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
-            // xquery/XQueryParser.g:2140:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
+            // xquery/XQueryParser.g:2142:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
+            // xquery/XQueryParser.g:2142:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17211); if (this.state.failed) return retval;
+            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17259); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53289,13 +53334,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17215);
-            p_IndexName753=this.p_IndexName();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17263);
+            p_IndexName740=this.p_IndexName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName753.getTree());
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17219); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName740.getTree());
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17267); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53303,7 +53348,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17225); if (this.state.failed) return retval;
+            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17273); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53311,13 +53356,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229);
-            p_IndexDomainExpr754=this.p_IndexDomainExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277);
+            p_IndexDomainExpr741=this.p_IndexDomainExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr754.getTree());
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17233); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr741.getTree());
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17281); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53325,13 +53370,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237);
-            p_IndexKeySpec755=this.p_IndexKeySpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285);
+            p_IndexKeySpec742=this.p_IndexKeySpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec755.getTree());
-            // xquery/XQueryParser.g:2140:142: ( COMMA p_IndexKeySpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec742.getTree());
+            // xquery/XQueryParser.g:2142:142: ( COMMA p_IndexKeySpec )*
             loop256:
             do {
                 var alt256=2;
@@ -53344,18 +53389,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt256) {
                 case 1 :
-                    // xquery/XQueryParser.g:2140:143: COMMA p_IndexKeySpec
-                    COMMA756=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17240); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2142:143: COMMA p_IndexKeySpec
+                    COMMA743=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA756_tree = this.adaptor.create(COMMA756);
-                    this.adaptor.addChild(root_0, COMMA756_tree);
+                    COMMA743_tree = this.adaptor.create(COMMA743);
+                    this.adaptor.addChild(root_0, COMMA743_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242);
-                    p_IndexKeySpec757=this.p_IndexKeySpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290);
+                    p_IndexKeySpec744=this.p_IndexKeySpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec757.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec744.getTree());
 
 
                     break;
@@ -53401,7 +53446,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2143:1: p_IndexName : p_QName ;
+    // xquery/XQueryParser.g:2145:1: p_IndexName : p_QName ;
     // $ANTLR start "p_IndexName"
     p_IndexName: function() {
         var retval = new XQueryParser.p_IndexName_return();
@@ -53409,20 +53454,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName758 = null;
+         var p_QName745 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2144:9: ( p_QName )
-            // xquery/XQueryParser.g:2144:11: p_QName
+            // xquery/XQueryParser.g:2146:9: ( p_QName )
+            // xquery/XQueryParser.g:2146:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17269);
-            p_QName758=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17317);
+            p_QName745=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName745.getTree());
 
 
 
@@ -53459,7 +53504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2147:1: p_IndexDomainExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2149:1: p_IndexDomainExpr : p_PathExpr ;
     // $ANTLR start "p_IndexDomainExpr"
     p_IndexDomainExpr: function() {
         var retval = new XQueryParser.p_IndexDomainExpr_return();
@@ -53467,20 +53512,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr759 = null;
+         var p_PathExpr746 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2148:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2148:11: p_PathExpr
+            // xquery/XQueryParser.g:2150:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2150:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294);
-            p_PathExpr759=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342);
+            p_PathExpr746=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr759.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr746.getTree());
 
 
 
@@ -53517,7 +53562,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2151:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
+    // xquery/XQueryParser.g:2153:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
     // $ANTLR start "p_IndexKeySpec"
     p_IndexKeySpec: function() {
         var retval = new XQueryParser.p_IndexKeySpec_return();
@@ -53525,23 +53570,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_IndexKeyExpr760 = null;
-         var p_IndexKeyTypeDecl761 = null;
-         var p_IndexKeyCollation762 = null;
+         var p_IndexKeyExpr747 = null;
+         var p_IndexKeyTypeDecl748 = null;
+         var p_IndexKeyCollation749 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2152:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
-            // xquery/XQueryParser.g:2152:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
+            // xquery/XQueryParser.g:2154:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319);
-            p_IndexKeyExpr760=this.p_IndexKeyExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367);
+            p_IndexKeyExpr747=this.p_IndexKeyExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr760.getTree());
-            // xquery/XQueryParser.g:2152:26: ( p_IndexKeyTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr747.getTree());
+            // xquery/XQueryParser.g:2154:26: ( p_IndexKeyTypeDecl )?
             var alt257=2;
             var LA257_0 = this.input.LA(1);
 
@@ -53550,20 +53595,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt257) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:26: p_IndexKeyTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321);
-                    p_IndexKeyTypeDecl761=this.p_IndexKeyTypeDecl();
+                    // xquery/XQueryParser.g:2154:26: p_IndexKeyTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369);
+                    p_IndexKeyTypeDecl748=this.p_IndexKeyTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl761.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl748.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2152:46: ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:46: ( p_IndexKeyCollation )?
             var alt258=2;
             var LA258_0 = this.input.LA(1);
 
@@ -53572,13 +53617,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt258) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:46: p_IndexKeyCollation
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324);
-                    p_IndexKeyCollation762=this.p_IndexKeyCollation();
+                    // xquery/XQueryParser.g:2154:46: p_IndexKeyCollation
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372);
+                    p_IndexKeyCollation749=this.p_IndexKeyCollation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation762.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation749.getTree());
 
 
                     break;
@@ -53621,7 +53666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2155:1: p_IndexKeyExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2157:1: p_IndexKeyExpr : p_PathExpr ;
     // $ANTLR start "p_IndexKeyExpr"
     p_IndexKeyExpr: function() {
         var retval = new XQueryParser.p_IndexKeyExpr_return();
@@ -53629,20 +53674,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr763 = null;
+         var p_PathExpr750 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2156:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2156:11: p_PathExpr
+            // xquery/XQueryParser.g:2158:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2158:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350);
-            p_PathExpr763=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398);
+            p_PathExpr750=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr750.getTree());
 
 
 
@@ -53679,7 +53724,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2159:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
+    // xquery/XQueryParser.g:2161:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
     // $ANTLR start "p_IndexKeyTypeDecl"
     p_IndexKeyTypeDecl: function() {
         var retval = new XQueryParser.p_IndexKeyTypeDecl_return();
@@ -53688,17 +53733,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_AtomicType764 = null;
-         var p_OccurrenceIndicator765 = null;
+         var p_AtomicType751 = null;
+         var p_OccurrenceIndicator752 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2160:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2160:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
+            // xquery/XQueryParser.g:2162:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2162:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17377); if (this.state.failed) return retval;
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17425); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53706,13 +53751,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381);
-            p_AtomicType764=this.p_AtomicType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429);
+            p_AtomicType751=this.p_AtomicType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType764.getTree());
-            // xquery/XQueryParser.g:2160:44: ( p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType751.getTree());
+            // xquery/XQueryParser.g:2162:44: ( p_OccurrenceIndicator )?
             var alt259=2;
             var LA259_0 = this.input.LA(1);
 
@@ -53721,13 +53766,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt259) {
                 case 1 :
-                    // xquery/XQueryParser.g:2160:44: p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383);
-                    p_OccurrenceIndicator765=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2162:44: p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431);
+                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator765.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
 
 
                     break;
@@ -53770,7 +53815,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2163:1: p_AtomicType : p_QName ;
+    // xquery/XQueryParser.g:2165:1: p_AtomicType : p_QName ;
     // $ANTLR start "p_AtomicType"
     p_AtomicType: function() {
         var retval = new XQueryParser.p_AtomicType_return();
@@ -53778,20 +53823,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName766 = null;
+         var p_QName753 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2164:9: ( p_QName )
-            // xquery/XQueryParser.g:2164:11: p_QName
+            // xquery/XQueryParser.g:2166:9: ( p_QName )
+            // xquery/XQueryParser.g:2166:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17409);
-            p_QName766=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17457);
+            p_QName753=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName766.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName753.getTree());
 
 
 
@@ -53828,7 +53873,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2167:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
+    // xquery/XQueryParser.g:2169:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
     // $ANTLR start "p_IndexKeyCollation"
     p_IndexKeyCollation: function() {
         var retval = new XQueryParser.p_IndexKeyCollation_return();
@@ -53837,16 +53882,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_StringLiteral767 = null;
+         var p_StringLiteral754 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2168:9: (k= COLLATION p_StringLiteral )
-            // xquery/XQueryParser.g:2168:11: k= COLLATION p_StringLiteral
+            // xquery/XQueryParser.g:2170:9: (k= COLLATION p_StringLiteral )
+            // xquery/XQueryParser.g:2170:11: k= COLLATION p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17436); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17484); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53854,12 +53899,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440);
-            p_StringLiteral767=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488);
+            p_StringLiteral754=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral767.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral754.getTree());
 
 
 
@@ -53896,7 +53941,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2171:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
+    // xquery/XQueryParser.g:2173:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
     // $ANTLR start "p_ICDecl"
     p_ICDecl: function() {
         var retval = new XQueryParser.p_ICDecl_return();
@@ -53905,18 +53950,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName768 = null;
-         var p_ICCollection769 = null;
-         var p_ICForeignKey770 = null;
+         var p_QName755 = null;
+         var p_ICCollection756 = null;
+         var p_ICForeignKey757 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2172:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
-            // xquery/XQueryParser.g:2172:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
+            // xquery/XQueryParser.g:2174:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
+            // xquery/XQueryParser.g:2174:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17467); if (this.state.failed) return retval;
+            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53924,7 +53969,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17473); if (this.state.failed) return retval;
+            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17521); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -53932,13 +53977,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17477);
-            p_QName768=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17525);
+            p_QName755=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName768.getTree());
-            // xquery/XQueryParser.g:2172:74: ( p_ICCollection | p_ICForeignKey )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName755.getTree());
+            // xquery/XQueryParser.g:2174:74: ( p_ICCollection | p_ICForeignKey )
             var alt260=2;
             var LA260_0 = this.input.LA(1);
 
@@ -53957,24 +54002,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt260) {
                 case 1 :
-                    // xquery/XQueryParser.g:2172:75: p_ICCollection
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17480);
-                    p_ICCollection769=this.p_ICCollection();
+                    // xquery/XQueryParser.g:2174:75: p_ICCollection
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17528);
+                    p_ICCollection756=this.p_ICCollection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection769.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection756.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2172:92: p_ICForeignKey
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17484);
-                    p_ICForeignKey770=this.p_ICForeignKey();
+                    // xquery/XQueryParser.g:2174:92: p_ICForeignKey
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17532);
+                    p_ICForeignKey757=this.p_ICForeignKey();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey770.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey757.getTree());
 
 
                     break;
@@ -54017,7 +54062,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2175:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
+    // xquery/XQueryParser.g:2177:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
     // $ANTLR start "p_ICCollection"
     p_ICCollection: function() {
         var retval = new XQueryParser.p_ICCollection_return();
@@ -54026,19 +54071,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName771 = null;
-         var p_ICCollSequence772 = null;
-         var p_ICCollSequenceUnique773 = null;
-         var p_ICCollNode774 = null;
+         var p_QName758 = null;
+         var p_ICCollSequence759 = null;
+         var p_ICCollSequenceUnique760 = null;
+         var p_ICCollNode761 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2176:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
-            // xquery/XQueryParser.g:2176:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            // xquery/XQueryParser.g:2178:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
+            // xquery/XQueryParser.g:2178:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17512); if (this.state.failed) return retval;
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17560); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54046,7 +54091,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17518); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17566); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54054,13 +54099,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17522);
-            p_QName771=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17570);
+            p_QName758=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName771.getTree());
-            // xquery/XQueryParser.g:2176:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            // xquery/XQueryParser.g:2178:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             var alt261=3;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -54082,35 +54127,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt261) {
                 case 1 :
-                    // xquery/XQueryParser.g:2176:68: p_ICCollSequence
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17525);
-                    p_ICCollSequence772=this.p_ICCollSequence();
+                    // xquery/XQueryParser.g:2178:68: p_ICCollSequence
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17573);
+                    p_ICCollSequence759=this.p_ICCollSequence();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence772.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence759.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2176:87: p_ICCollSequenceUnique
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529);
-                    p_ICCollSequenceUnique773=this.p_ICCollSequenceUnique();
+                    // xquery/XQueryParser.g:2178:87: p_ICCollSequenceUnique
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577);
+                    p_ICCollSequenceUnique760=this.p_ICCollSequenceUnique();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique773.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique760.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2176:112: p_ICCollNode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17533);
-                    p_ICCollNode774=this.p_ICCollNode();
+                    // xquery/XQueryParser.g:2178:112: p_ICCollNode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17581);
+                    p_ICCollNode761=this.p_ICCollNode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode774.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode761.getTree());
 
 
                     break;
@@ -54153,7 +54198,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2179:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2181:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollSequence"
     p_ICCollSequence: function() {
         var retval = new XQueryParser.p_ICCollSequence_return();
@@ -54164,22 +54209,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_ExprSingle775 = null;
+         var p_ExprSingle762 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2180:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2180:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2182:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2182:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17561); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17609); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17565);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17613);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54188,7 +54233,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17571); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17619); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54196,12 +54241,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17575);
-            p_ExprSingle775=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17623);
+            p_ExprSingle762=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle775.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle762.getTree());
 
 
 
@@ -54238,7 +54283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2183:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2185:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
     // $ANTLR start "p_ICCollSequenceUnique"
     p_ICCollSequenceUnique: function() {
         var retval = new XQueryParser.p_ICCollSequenceUnique_return();
@@ -54249,17 +54294,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_PathExpr776 = null;
+         var p_PathExpr763 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2184:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2184:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2186:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2186:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17603); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17651); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54267,12 +54312,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17613);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17661);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54281,7 +54326,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17619); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17667); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54289,7 +54334,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625); if (this.state.failed) return retval;
+            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54297,7 +54342,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17631); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17679); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54305,12 +54350,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635);
-            p_PathExpr776=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683);
+            p_PathExpr763=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr776.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
 
 
 
@@ -54347,7 +54392,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2187:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2189:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollNode"
     p_ICCollNode: function() {
         var retval = new XQueryParser.p_ICCollNode_return();
@@ -54358,17 +54403,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_ExprSingle777 = null;
+         var p_ExprSingle764 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2188:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2188:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2190:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2190:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17662); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17710); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54376,7 +54421,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17668); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17716); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54384,12 +54429,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17674); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17722); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17678);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17726);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54398,7 +54443,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17684); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17732); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54406,12 +54451,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17688);
-            p_ExprSingle777=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17736);
+            p_ExprSingle764=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle777.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle764.getTree());
 
 
 
@@ -54448,7 +54493,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2191:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
+    // xquery/XQueryParser.g:2193:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
     // $ANTLR start "p_ICForeignKey"
     p_ICForeignKey: function() {
         var retval = new XQueryParser.p_ICForeignKey_return();
@@ -54457,17 +54502,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeySource778 = null;
-         var p_ICForeignKeyTarget779 = null;
+         var p_ICForeignKeySource765 = null;
+         var p_ICForeignKeyTarget766 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2192:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
-            // xquery/XQueryParser.g:2192:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
+            // xquery/XQueryParser.g:2194:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
+            // xquery/XQueryParser.g:2194:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17716); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17764); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54475,7 +54520,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17722); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17770); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54483,18 +54528,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726);
-            p_ICForeignKeySource778=this.p_ICForeignKeySource();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774);
+            p_ICForeignKeySource765=this.p_ICForeignKeySource();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource778.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728);
-            p_ICForeignKeyTarget779=this.p_ICForeignKeyTarget();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource765.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776);
+            p_ICForeignKeyTarget766=this.p_ICForeignKeyTarget();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget779.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget766.getTree());
 
 
 
@@ -54531,7 +54576,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2195:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2197:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeySource"
     p_ICForeignKeySource: function() {
         var retval = new XQueryParser.p_ICForeignKeySource_return();
@@ -54540,16 +54585,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues780 = null;
+         var p_ICForeignKeyValues767 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2196:9: (k= FROM p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2196:11: k= FROM p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2198:9: (k= FROM p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2198:11: k= FROM p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17755); if (this.state.failed) return retval;
+            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17803); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54557,12 +54602,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759);
-            p_ICForeignKeyValues780=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807);
+            p_ICForeignKeyValues767=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues780.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues767.getTree());
 
 
 
@@ -54599,7 +54644,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2199:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2201:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeyTarget"
     p_ICForeignKeyTarget: function() {
         var retval = new XQueryParser.p_ICForeignKeyTarget_return();
@@ -54608,16 +54653,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues781 = null;
+         var p_ICForeignKeyValues768 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2200:9: (k= TO p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2200:11: k= TO p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2202:9: (k= TO p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2202:11: k= TO p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17786); if (this.state.failed) return retval;
+            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17834); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54625,12 +54670,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790);
-            p_ICForeignKeyValues781=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838);
+            p_ICForeignKeyValues768=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues781.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues768.getTree());
 
 
 
@@ -54667,7 +54712,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2203:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2205:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
     // $ANTLR start "p_ICForeignKeyValues"
     p_ICForeignKeyValues: function() {
         var retval = new XQueryParser.p_ICForeignKeyValues_return();
@@ -54678,18 +54723,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_QName782 = null;
-         var p_PathExpr783 = null;
+         var p_QName769 = null;
+         var p_PathExpr770 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2204:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2204:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2206:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2206:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54697,13 +54742,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17821);
-            p_QName782=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17869);
+            p_QName769=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName782.getTree());
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17825); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName769.getTree());
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17873); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54711,12 +54756,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17835);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17883);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -54725,7 +54770,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17841); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17889); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -54733,12 +54778,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845);
-            p_PathExpr783=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893);
+            p_PathExpr770=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr783.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr770.getTree());
 
 
 
@@ -54766,7 +54811,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred1_XQueryParser"
     synpred1_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
+        // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
         var alt262=2;
         var LA262_0 = this.input.LA(1);
 
@@ -54799,9 +54844,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt262) {
             case 1 :
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:13: ( FOR | LET ) DOLLAR
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:13: ( FOR | LET ) DOLLAR
                 if ( this.input.LA(1)==FOR||this.input.LA(1)==LET ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -54820,9 +54865,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:36: FOR ( TUMBLING | SLIDING )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:36: FOR ( TUMBLING | SLIDING )
                 this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_synpred1_XQueryParser3549); if (this.state.failed) return ;
                 if ( this.input.LA(1)==SLIDING||this.input.LA(1)==TUMBLING ) {
                     this.input.consume();
@@ -54846,8 +54891,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred2_XQueryParser"
     synpred2_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:573:11: ( IF LPAREN )
-        // xquery/XQueryParser.g:573:12: IF LPAREN
+        // xquery/XQueryParser.g:575:11: ( IF LPAREN )
+        // xquery/XQueryParser.g:575:12: IF LPAREN
         this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_synpred2_XQueryParser3577); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred2_XQueryParser3579); if (this.state.failed) return ;
 
@@ -54857,8 +54902,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred3_XQueryParser"
     synpred3_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )
-        // xquery/XQueryParser.g:574:12: SWITCH LPAREN
+        // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )
+        // xquery/XQueryParser.g:576:12: SWITCH LPAREN
         this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_synpred3_XQueryParser3607); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred3_XQueryParser3609); if (this.state.failed) return ;
 
@@ -54868,8 +54913,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred4_XQueryParser"
     synpred4_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )
-        // xquery/XQueryParser.g:575:12: TYPESWITCH LPAREN
+        // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )
+        // xquery/XQueryParser.g:577:12: TYPESWITCH LPAREN
         this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_synpred4_XQueryParser3633); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred4_XQueryParser3635); if (this.state.failed) return ;
 
@@ -54879,8 +54924,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred5_XQueryParser"
     synpred5_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )
-        // xquery/XQueryParser.g:576:12: TRY LBRACKET
+        // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )
+        // xquery/XQueryParser.g:578:12: TRY LBRACKET
         this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_synpred5_XQueryParser3655); if (this.state.failed) return ;
         this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred5_XQueryParser3657); if (this.state.failed) return ;
 
@@ -54890,10 +54935,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred6_XQueryParser"
     synpred6_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
-        // xquery/XQueryParser.g:862:12: VALIDATE ( p_ValidationMode | TYPE )?
-        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6185); if (this.state.failed) return ;
-        // xquery/XQueryParser.g:862:21: ( p_ValidationMode | TYPE )?
+        // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
+        // xquery/XQueryParser.g:864:12: VALIDATE ( p_ValidationMode | TYPE )?
+        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6189); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:864:21: ( p_ValidationMode | TYPE )?
         var alt263=3;
         var LA263_0 = this.input.LA(1);
 
@@ -54905,8 +54950,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt263) {
             case 1 :
-                // xquery/XQueryParser.g:862:23: p_ValidationMode
-                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189);
+                // xquery/XQueryParser.g:864:23: p_ValidationMode
+                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193);
                 this.p_ValidationMode();
 
                 this.state._fsp--;
@@ -54915,8 +54960,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:862:42: TYPE
-                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6193); if (this.state.failed) return ;
+                // xquery/XQueryParser.g:864:42: TYPE
+                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6197); if (this.state.failed) return ;
 
 
                 break;
@@ -54930,10 +54975,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred7_XQueryParser"
     synpred7_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )
-        // xquery/XQueryParser.g:907:12: SLASH p_RelativePathExpr
-        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6549); if (this.state.failed) return ;
-        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551);
+        // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )
+        // xquery/XQueryParser.g:909:12: SLASH p_RelativePathExpr
+        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6553); if (this.state.failed) return ;
+        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555);
         this.p_RelativePathExpr();
 
         this.state._fsp--;
@@ -54945,7 +54990,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred8_XQueryParser"
     synpred8_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
+        // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
         // xquery/XQueryParser.g:
         if ( this.input.LA(1)==LPAREN||(this.input.LA(1)>=DOLLAR && this.input.LA(1)<=LBRACKET)||this.input.LA(1)==SMALLER||(this.input.LA(1)>=APOS && this.input.LA(1)<=QUOT) ) {
             this.input.consume();
@@ -54964,7 +55009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred9_XQueryParser"
     synpred9_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
+        // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
         var alt266=3;
         switch ( this.input.LA(1) ) {
         case ATTRIBUTE:
@@ -54990,9 +55035,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         switch (alt266) {
             case 1 :
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
                 if ( this.input.LA(1)==ATTRIBUTE||this.input.LA(1)==ELEMENT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55003,7 +55048,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:922:36: ( p_QName )?
+                // xquery/XQueryParser.g:924:36: ( p_QName )?
                 var alt264=2;
                 var LA264_0 = this.input.LA(1);
 
@@ -55012,8 +55057,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt264) {
                     case 1 :
-                        // xquery/XQueryParser.g:922:36: p_QName
-                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6726);
+                        // xquery/XQueryParser.g:924:36: p_QName
+                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6730);
                         this.p_QName();
 
                         this.state._fsp--;
@@ -55024,7 +55069,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6729); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6733); if (this.state.failed) return ;
 
 
 
@@ -55032,9 +55077,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
                 if ( this.input.LA(1)==NAMESPACE||this.input.LA(1)==PROCESSING_INSTRUCTION ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55045,7 +55090,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:923:51: ( p_NCName )?
+                // xquery/XQueryParser.g:925:51: ( p_NCName )?
                 var alt265=2;
                 var LA265_0 = this.input.LA(1);
 
@@ -55054,8 +55099,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt265) {
                     case 1 :
-                        // xquery/XQueryParser.g:923:51: p_NCName
-                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6755);
+                        // xquery/XQueryParser.g:925:51: p_NCName
+                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6759);
                         this.p_NCName();
 
                         this.state._fsp--;
@@ -55066,7 +55111,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6758); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6762); if (this.state.failed) return ;
 
 
 
@@ -55074,9 +55119,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 3 :
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
                 if ( this.input.LA(1)==COMMENT||this.input.LA(1)==DOCUMENT||this.input.LA(1)==TEXT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -55087,7 +55132,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6788); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6792); if (this.state.failed) return ;
 
 
 
@@ -55100,9 +55145,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred10_XQueryParser"
     synpred10_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:926:11: ( p_KindTest )
-        // xquery/XQueryParser.g:926:12: p_KindTest
-        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6818);
+        // xquery/XQueryParser.g:928:11: ( p_KindTest )
+        // xquery/XQueryParser.g:928:12: p_KindTest
+        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6822);
         this.p_KindTest();
 
         this.state._fsp--;
@@ -55114,14 +55159,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred11_XQueryParser"
     synpred11_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )
-        // xquery/XQueryParser.g:927:12: p_QName LPAREN
-        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6837);
+        // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )
+        // xquery/XQueryParser.g:929:12: p_QName LPAREN
+        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6841);
         this.p_QName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6839); if (this.state.failed) return ;
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6843); if (this.state.failed) return ;
 
 
     },
@@ -55129,9 +55174,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred12_XQueryParser"
     synpred12_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )
-        // xquery/XQueryParser.g:928:12: p_PrimaryExpr
-        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857);
+        // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )
+        // xquery/XQueryParser.g:930:12: p_PrimaryExpr
+        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861);
         this.p_PrimaryExpr();
 
         this.state._fsp--;
@@ -55143,9 +55188,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred13_XQueryParser"
     synpred13_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:986:11: ( p_Wildcard )
-        // xquery/XQueryParser.g:986:12: p_Wildcard
-        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296);
+        // xquery/XQueryParser.g:988:11: ( p_Wildcard )
+        // xquery/XQueryParser.g:988:12: p_Wildcard
+        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300);
         this.p_Wildcard();
 
         this.state._fsp--;
@@ -55157,14 +55202,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred14_XQueryParser"
     synpred14_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:987:11: ( p_NCName COLON )
-        // xquery/XQueryParser.g:987:12: p_NCName COLON
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7315);
+        // xquery/XQueryParser.g:989:11: ( p_NCName COLON )
+        // xquery/XQueryParser.g:989:12: p_NCName COLON
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7319);
         this.p_NCName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7317); if (this.state.failed) return ;
+        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7321); if (this.state.failed) return ;
 
 
     },
@@ -55172,9 +55217,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred15_XQueryParser"
     synpred15_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:988:11: ( p_NCName )
-        // xquery/XQueryParser.g:988:12: p_NCName
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7335);
+        // xquery/XQueryParser.g:990:11: ( p_NCName )
+        // xquery/XQueryParser.g:990:12: p_NCName
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7339);
         this.p_NCName();
 
         this.state._fsp--;
@@ -55186,9 +55231,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred16_XQueryParser"
     synpred16_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1025:11: ( LPAREN )
-        // xquery/XQueryParser.g:1025:12: LPAREN
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7591); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:1027:11: ( LPAREN )
+        // xquery/XQueryParser.g:1027:12: LPAREN
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7595); if (this.state.failed) return ;
 
 
     },
@@ -55196,9 +55241,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred17_XQueryParser"
     synpred17_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:1304:27: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602);
+        // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:1306:27: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -55210,9 +55255,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred18_XQueryParser"
     synpred18_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:2136:45: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176);
+        // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:2138:45: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -55493,7 +55538,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA1_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA1_specialS:
-        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
+        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
     DFA1_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -55570,7 +55615,7 @@ XQueryParser.DFA1 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "294:13: (vd= p_VersionDecl )?";
+        return "296:13: (vd= p_VersionDecl )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55578,6 +55623,25 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA1_1 = input.LA(1);
+
+                             
+                            var index1_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
+
+                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA1_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index1_1);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA1_0 = input.LA(1);
 
                              
@@ -55598,25 +55662,6 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
                             input.seek(index1_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA1_1 = input.LA(1);
-
-                             
-                            var index1_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
-
-                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA1_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index1_1);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -55642,7 +55687,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA2_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA2_specialS:
-        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
+        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
     DFA2_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -55719,7 +55764,7 @@ XQueryParser.DFA2 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
+        return "297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55727,25 +55772,6 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA2_1 = input.LA(1);
-
-                             
-                            var index2_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
-
-                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA2_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index2_1);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
                             var LA2_0 = input.LA(1);
 
                              
@@ -55766,6 +55792,25 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
                             input.seek(index2_0);
                             if ( s>=0 ) return s;
                             break;
+                        case 1 : 
+                            var LA2_1 = input.LA(1);
+
+                             
+                            var index2_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
+
+                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA2_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index2_1);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -55792,7 +55837,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0002\uffff\u0002\u0002\u0001\uffff\u0001\u0002\u0002\u0001\u0002"+
     "\u0002",
     DFA6_specialS:
-        "\u0001\u0001\u0001\u0000\u0002\uffff\u0001\u0002\u0005\uffff}>",
+        "\u0001\u0002\u0001\u0000\u0002\uffff\u0001\u0001\u0005\uffff}>",
     DFA6_transitionS: [
             "\u0002\u0002\u0004\u0005\u0001\u0002\u0006\u0005\u0001\u0002"+
             "\u0001\u0005\u0001\u0002\u0002\u0005\u0001\u0001\u0001\u0005"+
@@ -55883,7 +55928,7 @@ XQueryParser.DFA6 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "()* loopback of 330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
+        return "()* loopback of 332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -55912,6 +55957,23 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             if ( s>=0 ) return s;
                             break;
                         case 1 : 
+                            var LA6_4 = input.LA(1);
+
+                             
+                            var index6_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
+
+                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
+
+                             
+                            input.seek(index6_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
                             var LA6_0 = input.LA(1);
 
                              
@@ -55932,23 +55994,6 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             input.seek(index6_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA6_4 = input.LA(1);
-
-                             
-                            var index6_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
-
-                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
-
-                             
-                            input.seek(index6_4);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -56032,7 +56077,7 @@ XQueryParser.DFA9 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA9, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
+        return "358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -56239,7 +56284,7 @@ XQueryParser.DFA44 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
+        return "537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57137,7 +57182,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_50 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57272,7 +57317,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_59 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57287,7 +57332,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_60 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57302,7 +57347,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_61 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57317,7 +57362,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_62 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -57441,8 +57486,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0007\uffff\u0001\u0006\u0005\u0001\u0001\u0002\u0001\u0003\u0001"+
     "\u0004\u0001\u0005",
     DFA46_specialS:
-        "\u0001\uffff\u0001\u0003\u0001\u0000\u0001\u0005\u0001\u0002\u0001"+
-    "\u0004\u0001\u0001\u000a\uffff}>",
+        "\u0001\uffff\u0001\u0005\u0001\u0003\u0001\u0002\u0001\u0000\u0001"+
+    "\u0001\u0001\u0004\u000a\uffff}>",
     DFA46_transitionS: [
             "\u0025\u0007\u0001\u0001\u0005\u0007\u0001\u0003\u000a\u0007"+
             "\u0001\u0002\u0021\u0007\u0001\u0005\u001d\u0007\u0001\u0004"+
@@ -57593,7 +57638,7 @@ XQueryParser.DFA46 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
+        return "573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57601,6 +57646,51 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA46_4 = input.LA(1);
+
+                             
+                            var index46_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
+
+                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
+                            var LA46_5 = input.LA(1);
+
+                             
+                            var index46_5 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
+
+                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_5);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
+                            var LA46_3 = input.LA(1);
+
+                             
+                            var index46_3 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
+
+                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_3);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
                             var LA46_2 = input.LA(1);
 
                              
@@ -57617,7 +57707,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_2);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
+                        case 4 : 
                             var LA46_6 = input.LA(1);
 
                              
@@ -57632,22 +57722,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_6);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA46_4 = input.LA(1);
-
-                             
-                            var index46_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
-
-                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 3 : 
+                        case 5 : 
                             var LA46_1 = input.LA(1);
 
                              
@@ -57666,36 +57741,6 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_1);
                             if ( s>=0 ) return s;
                             break;
-                        case 4 : 
-                            var LA46_5 = input.LA(1);
-
-                             
-                            var index46_5 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
-
-                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_5);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 5 : 
-                            var LA46_3 = input.LA(1);
-
-                             
-                            var index46_3 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
-
-                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_3);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -57818,7 +57863,7 @@ XQueryParser.DFA117 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA117, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
+        return "908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -57983,7 +58028,7 @@ XQueryParser.DFA119 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
+        return "921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -58396,13 +58441,13 @@ org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
                             s = -1;
                             if ( ((this.synpred8_XQueryParser()||(this.synpred8_XQueryParser()&&(this.lc(MLS))))) ) {s = 45;}
 
-                            else if ( (((this.synpred9_XQueryParser()&&(this.lc(MLS)))||this.synpred9_XQueryParser())) ) {s = 46;}
+                            else if ( ((this.synpred9_XQueryParser()||(this.synpred9_XQueryParser()&&(this.lc(MLS))))) ) {s = 46;}
 
                             else if ( (this.synpred10_XQueryParser()) ) {s = 49;}
 
-                            else if ( (((this.synpred11_XQueryParser()&&(this.lc(MLS)))||this.synpred11_XQueryParser())) ) {s = 47;}
+                            else if ( ((this.synpred11_XQueryParser()||(this.synpred11_XQueryParser()&&(this.lc(MLS))))) ) {s = 47;}
 
-                            else if ( ((this.synpred12_XQueryParser()||(this.synpred12_XQueryParser()&&(this.lc(MLS))))) ) {s = 48;}
+                            else if ( (((this.synpred12_XQueryParser()&&(this.lc(MLS)))||this.synpred12_XQueryParser())) ) {s = 48;}
 
                             else if ( (true) ) {s = 50;}
 
@@ -59128,7 +59173,7 @@ XQueryParser.DFA121 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA121, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
+        return "940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
     },
     dummy: null
 });
@@ -59365,7 +59410,7 @@ XQueryParser.DFA126 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA126, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "980:1: p_NodeTest : ( p_KindTest | p_NameTest );";
+        return "982:1: p_NodeTest : ( p_KindTest | p_NameTest );";
     },
     dummy: null
 });
@@ -59386,7 +59431,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     "\uffff\u0001\u0005\u0002\uffff\u0001\u0008\u0006\uffff\u0001\u0009\u0001"+
     "\u0006\u0001\u0007\u0002\u0008",
     DFA134_specialS:
-        "\u0001\u0000\u000d\uffff\u0001\u0001\u0007\uffff}>",
+        "\u0001\u0001\u000d\uffff\u0001\u0000\u0007\uffff}>",
     DFA134_transitionS: [
             "\u0006\u0007\u0001\u000c\u0008\u0007\u0001\u000f\u0008\u0007"+
             "\u0001\u0009\u0001\u0007\u0001\u0006\u001f\u0007\u0001\u000b"+
@@ -59466,7 +59511,7 @@ XQueryParser.DFA134 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
+        return "1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -59474,6 +59519,21 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA134_14 = input.LA(1);
+
+                             
+                            var index134_14 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
+
+                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
+
+                             
+                            input.seek(index134_14);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA134_0 = input.LA(1);
 
                              
@@ -59518,21 +59578,6 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
                             input.seek(index134_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA134_14 = input.LA(1);
-
-                             
-                            var index134_14 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
-
-                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
-
-                             
-                            input.seek(index134_14);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -59692,7 +59737,7 @@ XQueryParser.DFA162 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA162, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
+        return "1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60045,7 +60090,7 @@ XQueryParser.DFA164 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA164, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
+        return "1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60149,7 +60194,7 @@ XQueryParser.DFA218 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA218, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
+        return "1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
     },
     dummy: null
 });
@@ -60290,7 +60335,7 @@ XQueryParser.DFA237 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA237, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
+        return "1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
     },
     dummy: null
 });
@@ -60306,8 +60351,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA253_acceptS:
         "\u0003\uffff\u0001\u0002\u0005\uffff\u0001\u0001\u0001\u0003",
     DFA253_specialS:
-        "\u0004\uffff\u0001\u0000\u0001\u0004\u0001\u0003\u0001\u0002\u0001"+
-    "\u0001\u0002\uffff}>",
+        "\u0004\uffff\u0001\u0002\u0001\u0001\u0001\u0004\u0001\u0000\u0001"+
+    "\u0003\u0002\uffff}>",
     DFA253_transitionS: [
             "\u0020\u0003\u0001\u0002\u002f\u0003\u0001\u0001\u002e\u0003"+
             "\u0001\u0008\u0001\u0005\u0001\u0003\u0001\u0004\u0004\u0003"+
@@ -60468,7 +60513,7 @@ XQueryParser.DFA253 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
+        return "2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -60476,36 +60521,6 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA253_4 = input.LA(1);
-
-                             
-                            var index253_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
-
-                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
-
-                             
-                            input.seek(index253_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
-                            var LA253_8 = input.LA(1);
-
-                             
-                            var index253_8 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_8);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 2 : 
                             var LA253_7 = input.LA(1);
 
                              
@@ -60520,22 +60535,7 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_7);
                             if ( s>=0 ) return s;
                             break;
-                        case 3 : 
-                            var LA253_6 = input.LA(1);
-
-                             
-                            var index253_6 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_6);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 4 : 
+                        case 1 : 
                             var LA253_5 = input.LA(1);
 
                              
@@ -60550,6 +60550,51 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_5);
                             if ( s>=0 ) return s;
                             break;
+                        case 2 : 
+                            var LA253_4 = input.LA(1);
+
+                             
+                            var index253_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
+
+                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
+
+                             
+                            input.seek(index253_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
+                            var LA253_8 = input.LA(1);
+
+                             
+                            var index253_8 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_8);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 4 : 
+                            var LA253_6 = input.LA(1);
+
+                             
+                            var index253_6 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_6);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -60797,1025 +60842,1025 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_p_OrderByClause_in_p_IntermediateClause3786: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_CountClause_in_p_IntermediateClause3790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_CONCAT_in_p_StringConcatExpr3815: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_FOR_in_p_ForClause3844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ForClause3851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3853: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_ForBinding3883: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_TypeDeclaration_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_AllowingEmpty_in_p_ForBinding3894: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_PositionalVar_in_p_ForBinding3897: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_FTScoreVar_in_p_ForBinding3900: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_ForBinding3905: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALLOWING_in_p_AllowingEmpty3938: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
-    FOLLOW_EMPTY_in_p_AllowingEmpty3944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_PositionalVar3974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_PositionalVar3980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LET_in_p_LetClause4014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_LetClause4021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4023: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_LetBinding4057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_TypeDeclaration_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_FTScoreVar_in_p_LetBinding4071: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_LetBinding4077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOR_in_p_WindowClause4106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
-    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TUMBLING_in_p_TumblingWindowClause4152: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_TumblingWindowClause4158: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TumblingWindowClause4164: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_TumblingWindowClause4177: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLIDING_in_p_SlidingWindowClause4215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_SlidingWindowClause4221: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_SlidingWindowClause4227: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_SlidingWindowClause4240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_START_in_p_WindowStartCondition4278: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ONLY_in_p_WindowEndCondition4320: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_WindowEndCondition4328: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4370: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CurrentItem_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_p_PositionalVar_in_p_WindowVars4380: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_PREVIOUS_in_p_WindowVars4386: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PreviousItem_in_p_WindowVars4392: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_NEXT_in_p_WindowVars4399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NextItem_in_p_WindowVars4405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_CurrentItem4433: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_PreviousItem4459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NextItem4485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COUNT_in_p_CountClause4513: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CountClause4519: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CountClause4523: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHERE_in_p_WhereClause4561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GROUP_in_p_GroupByClause4594: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_GroupByClause4600: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_GroupingSpecList4633: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_GroupingSpec4665: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_GroupingSpec4676: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4712: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_STABLE_in_p_OrderByClause4724: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpecList_in_p_OrderByClause4738: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_OrderSpecList4767: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_ExprSingle_in_p_OrderSpec4797: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
-    FOLLOW_p_OrderModifier_in_p_OrderSpec4800: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ASCENDING_in_p_OrderModifier4829: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_DESCENDING_in_p_OrderModifier4835: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_EMPTY_in_p_OrderModifier4842: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
-    FOLLOW_GREATEST_in_p_OrderModifier4847: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_LEAST_in_p_OrderModifier4853: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_OrderModifier4861: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_OrderModifier4863: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnHybrid4896: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SOME_in_p_QuantifiedExpr4930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_EVERY_in_p_QuantifiedExpr4936: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4956: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4981: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_SATISFIES_in_p_QuantifiedExpr4992: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchHybrid5026: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchHybrid5032: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchHybrid5035: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchHybrid5043: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchHybrid5049: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseHybrid5084: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseHybrid5094: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchHybrid5161: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchHybrid5164: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchHybrid5191: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseHybrid5225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseHybrid5232: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseHybrid5242: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_SequenceTypeUnion5286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_IF_in_p_IfHybrid5319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfHybrid5325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfHybrid5328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfHybrid5341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TryClause_in_p_TryCatchExpr5372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_p_CatchClause_in_p_TryCatchExpr5374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryClause5403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_TryClause5407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TryTargetExpr_in_p_TryClause5409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TryTargetExpr5437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CATCH_in_p_CatchClause5466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CatchClause5472: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CatchClause5477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5503: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_CatchErrorList5506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5508: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_OR_in_p_OrExpr5559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5592: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_AND_in_p_AndExpr5598: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
-    FOLLOW_p_ValueComp_in_p_ComparisonExpr5637: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_RangeExpr5683: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_PLUS_in_p_AdditiveExpr5723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_AdditiveExpr5731: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_MultiplicativeExpr5772: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DIV_in_p_MultiplicativeExpr5781: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_IDIV_in_p_MultiplicativeExpr5787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MOD_in_p_MultiplicativeExpr5793: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_UNION_in_p_UnionExpr5835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_VBAR_in_p_UnionExpr5841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
-    FOLLOW_INSTANCE_in_p_InstanceofExpr5926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_InstanceofExpr5932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastableExpr_in_p_TreatExpr5964: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_TREAT_in_p_TreatExpr5970: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TreatExpr5976: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastExpr_in_p_CastableExpr6017: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
-    FOLLOW_CASTABLE_in_p_CastableExpr6023: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastableExpr6029: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnaryExpr_in_p_CastExpr6070: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
-    FOLLOW_CAST_in_p_CastExpr6076: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastExpr6082: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PLUS_in_p_UnaryExpr6118: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_UnaryExpr6126: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ValueExpr_in_p_UnaryExpr6131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ValidateExpr_in_p_ValueExpr6201: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ValueExpr6213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQUAL_in_p_GeneralComp6254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NOTEQUAL_in_p_GeneralComp6260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_GeneralComp6266: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLEREQ_in_p_GeneralComp6272: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_GeneralComp6278: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATEREQ_in_p_GeneralComp6284: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQ_in_p_ValueComp6316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NE_in_p_ValueComp6322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LT_in_p_ValueComp6328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LE_in_p_ValueComp6334: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GT_in_p_ValueComp6340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GE_in_p_ValueComp6346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IS_in_p_NodeComp6377: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_GREATER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_p_ValidateExpr6415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_ValidationMode_in_p_ValidateExpr6421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_TYPE_in_p_ValidateExpr6427: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_ValidateExpr6436: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ValidateExpr6438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ValidateExpr6441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LAX_in_p_ValidationMode6470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STRICT_in_p_ValidationMode6476: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_ExtensionExpr6505: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_ExtensionExpr6508: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ExtensionExpr6510: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6557: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6559: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6572: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_SLASH_in_p_PathExpr6584: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6586: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6626: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_set_in_p_RelativePathExpr6629: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6637: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6823: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6862: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseStep_in_p_AxisStep6901: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_ForwardStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_PredicateList_in_p_AxisStep6908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ForwardAxis_in_p_ForwardStep6934: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ForwardStep6936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CHILD_in_p_ForwardAxis6974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6976: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_in_p_ForwardAxis6988: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SELF_in_p_ForwardAxis7016: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7046: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_in_p_ForwardAxis7058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7060: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseAxis_in_p_ReverseStep7115: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ReverseStep7117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARENT_in_p_ReverseAxis7155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_in_p_ReverseAxis7169: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_in_p_ReverseAxis7197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_NodeTest7265: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_p_NameTest7301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_Wildcard7370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7373: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7389: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Wildcard7405: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_Predicate_in_p_PostfixExpr7450: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LPAREN_in_p_ArgumentList7491: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ArgumentList7497: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7499: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_ArgumentList7505: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Predicate_in_p_PredicateList7531: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LSQUARE_in_p_Predicate7558: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_Predicate7560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
-    FOLLOW_RSQUARE_in_p_Predicate7563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Literal_in_p_PrimaryExpr7608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarRef_in_p_PrimaryExpr7620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Constructor_in_p_PrimaryExpr7680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NumericLiteral_in_p_Literal7720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarRef7806: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarRef7810: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_VarName7838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedExpr7864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ParenthesizedExpr7866: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_in_p_ContextItemExpr7896: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_OrderedExpr7924: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_OrderedExpr7930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_OrderedExpr7933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNORDERED_in_p_UnorderedExpr7961: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_UnorderedExpr7967: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_UnorderedExpr7970: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_FQName_in_p_FunctionCall7999: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_ArgumentList_in_p_FunctionCall8004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_Argument8030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_p_Constructor8087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ComputedConstructor_in_p_Constructor8099: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_DirElemConstructor8176: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
-    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
-    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8216: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8232: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8309: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirAttributeList8314: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_EQUAL_in_p_DirAttributeList8321: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8360: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8367: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8414: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8421: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CDataSection_in_pm_DirElemContent8553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_pm_DirElemContent8565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CharRef_in_pm_CommonContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CDataSection_in_p_CDataSection8817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompDocConstructor8969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompDocConstructor8973: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_pm_CompElemConstructor9009: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompElemConstructor9014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9019: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompElemConstructor9021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9024: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9028: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompAttrConstructor9093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompAttrConstructor9100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Prefix9188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_PrefixExpr9214: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_URIExpr9241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_CompTextConstructor9270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompTextConstructor9274: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompTextConstructor9276: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompTextConstructor9279: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_CompBinaryConstructor9307: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompBinaryConstructor9313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_pm_CompCommentConstructor9345: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pm_CompPIConstructor9387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9392: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompPIConstructor9394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9401: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_SingleType9451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_TypeDeclaration9480: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypeDeclaration9486: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SequenceType9545: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SequenceType9549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_SequenceType9598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONCAT_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_FOR_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3852: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ForClause3855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_TypeDeclaration_in_p_ForBinding3895: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_AllowingEmpty_in_p_ForBinding3898: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_PositionalVar_in_p_ForBinding3901: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_FTScoreVar_in_p_ForBinding3904: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ForBinding3913: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALLOWING_in_p_AllowingEmpty3942: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
+    FOLLOW_EMPTY_in_p_AllowingEmpty3948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_PositionalVar3978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_PositionalVar3988: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LET_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_LetClause4025: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_TypeDeclaration_in_p_LetBinding4069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_FTScoreVar_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_LetBinding4079: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_LetBinding4081: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOR_in_p_WindowClause4110: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
+    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TUMBLING_in_p_TumblingWindowClause4156: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_TumblingWindowClause4162: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLIDING_in_p_SlidingWindowClause4219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_SlidingWindowClause4225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_START_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ONLY_in_p_WindowEndCondition4324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CurrentItem_in_p_WindowVars4378: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_p_PositionalVar_in_p_WindowVars4384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_PREVIOUS_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4394: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PreviousItem_in_p_WindowVars4396: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_NEXT_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NextItem_in_p_WindowVars4409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_CurrentItem4437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_PreviousItem4463: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NextItem4489: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COUNT_in_p_CountClause4517: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CountClause4523: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CountClause4527: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHERE_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WhereClause4569: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GROUP_in_p_GroupByClause4598: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_GroupingSpecList4637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_GroupingSpec4673: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_GroupingSpec4684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4720: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_STABLE_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4736: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpecList_in_p_OrderByClause4742: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_OrderSpecList4771: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4773: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_ExprSingle_in_p_OrderSpec4801: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
+    FOLLOW_p_OrderModifier_in_p_OrderSpec4804: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ASCENDING_in_p_OrderModifier4833: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_DESCENDING_in_p_OrderModifier4839: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_EMPTY_in_p_OrderModifier4846: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
+    FOLLOW_GREATEST_in_p_OrderModifier4851: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_LEAST_in_p_OrderModifier4857: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_OrderModifier4865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_OrderModifier4867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnHybrid4904: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SOME_in_p_QuantifiedExpr4934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_EVERY_in_p_QuantifiedExpr4940: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_SATISFIES_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchHybrid5034: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchHybrid5036: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchHybrid5039: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchHybrid5047: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchHybrid5057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchHybrid5163: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchHybrid5165: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchHybrid5168: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchHybrid5187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseHybrid5229: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseHybrid5240: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseHybrid5246: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_CaseHybrid5260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_SequenceTypeUnion5290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_IF_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfHybrid5327: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfHybrid5329: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5340: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5349: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TryClause_in_p_TryCatchExpr5376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_p_CatchClause_in_p_TryCatchExpr5378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryClause5407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TryTargetExpr_in_p_TryClause5413: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_TryClause5415: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TryTargetExpr5441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CATCH_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CatchClause5476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CatchClause5478: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CatchClause5481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5507: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_CatchErrorList5510: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5512: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_OR_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5596: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_AND_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5606: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
+    FOLLOW_p_ValueComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeComp_in_p_ComparisonExpr5649: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_PLUS_in_p_AdditiveExpr5727: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_AdditiveExpr5735: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_MultiplicativeExpr5776: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DIV_in_p_MultiplicativeExpr5785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_IDIV_in_p_MultiplicativeExpr5791: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MOD_in_p_MultiplicativeExpr5797: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_UNION_in_p_UnionExpr5839: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_VBAR_in_p_UnionExpr5845: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
+    FOLLOW_INSTANCE_in_p_InstanceofExpr5930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_InstanceofExpr5940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastableExpr_in_p_TreatExpr5968: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_TREAT_in_p_TreatExpr5974: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TreatExpr5984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastExpr_in_p_CastableExpr6021: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
+    FOLLOW_CASTABLE_in_p_CastableExpr6027: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastableExpr6037: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnaryExpr_in_p_CastExpr6074: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
+    FOLLOW_CAST_in_p_CastExpr6080: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastExpr6090: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PLUS_in_p_UnaryExpr6122: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_UnaryExpr6130: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ValueExpr_in_p_UnaryExpr6135: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ValidateExpr_in_p_ValueExpr6205: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ValueExpr6217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQUAL_in_p_GeneralComp6258: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NOTEQUAL_in_p_GeneralComp6264: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_GeneralComp6270: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLEREQ_in_p_GeneralComp6276: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_GeneralComp6282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATEREQ_in_p_GeneralComp6288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQ_in_p_ValueComp6320: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NE_in_p_ValueComp6326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LT_in_p_ValueComp6332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LE_in_p_ValueComp6338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GT_in_p_ValueComp6344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GE_in_p_ValueComp6350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IS_in_p_NodeComp6381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_GREATER_in_p_NodeComp6391: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_VALIDATE_in_p_ValidateExpr6419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_ValidationMode_in_p_ValidateExpr6425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_TYPE_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ValidateExpr6435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_ValidateExpr6440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ValidateExpr6442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ValidateExpr6445: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LAX_in_p_ValidationMode6474: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STRICT_in_p_ValidationMode6480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_ExtensionExpr6509: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_ExtensionExpr6512: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ExtensionExpr6518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_SLASH_in_p_PathExpr6588: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6590: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_set_in_p_RelativePathExpr6633: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6695: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6809: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6827: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6866: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6878: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_ForwardStep_in_p_AxisStep6909: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_PredicateList_in_p_AxisStep6912: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ForwardAxis_in_p_ForwardStep6938: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ForwardStep6940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CHILD_in_p_ForwardAxis6978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_in_p_ForwardAxis6992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SELF_in_p_ForwardAxis7020: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7036: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7050: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_in_p_ForwardAxis7062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7064: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseAxis_in_p_ReverseStep7119: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ReverseStep7121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARENT_in_p_ReverseAxis7159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_in_p_ReverseAxis7173: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7175: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_in_p_ReverseAxis7201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7203: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_NodeTest7273: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_p_NameTest7305: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_Wildcard7374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7379: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7395: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7397: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7411: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7413: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_Predicate_in_p_PostfixExpr7454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LPAREN_in_p_ArgumentList7495: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7498: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ArgumentList7501: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7503: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_ArgumentList7509: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Predicate_in_p_PredicateList7535: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LSQUARE_in_p_Predicate7562: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_Predicate7564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
+    FOLLOW_RSQUARE_in_p_Predicate7567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Literal_in_p_PrimaryExpr7612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarRef_in_p_PrimaryExpr7624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Constructor_in_p_PrimaryExpr7684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NumericLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Literal7728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarRef7810: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarRef7814: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_VarName7842: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedExpr7868: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedExpr7874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_in_p_ContextItemExpr7900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_OrderedExpr7932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_OrderedExpr7934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_OrderedExpr7937: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNORDERED_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_UnorderedExpr7969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_UnorderedExpr7971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_UnorderedExpr7974: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_FQName_in_p_FunctionCall8003: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_ArgumentList_in_p_FunctionCall8008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_Argument8034: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_p_Constructor8091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ComputedConstructor_in_p_Constructor8103: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_DirElemConstructor8180: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
+    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
+    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8220: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirElemConstructor8233: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8313: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_EQUAL_in_p_DirAttributeList8325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8327: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8366: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8379: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8389: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8434: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8447: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CDataSection_in_pm_DirElemContent8593: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_pm_DirElemContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CharRef_in_pm_CommonContent8657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CDataSection_in_p_CDataSection8865: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompDocConstructor9017: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompDocConstructor9021: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_pm_CompElemConstructor9057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompElemConstructor9062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9067: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompElemConstructor9069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9072: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9076: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompAttrConstructor9141: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompAttrConstructor9148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Prefix9236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_PrefixExpr9262: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_URIExpr9289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_CompTextConstructor9318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompTextConstructor9322: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompTextConstructor9324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompTextConstructor9327: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_CompBinaryConstructor9355: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompBinaryConstructor9361: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_pm_CompCommentConstructor9393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pm_CompPIConstructor9435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompPIConstructor9442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9449: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9453: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_SingleType9499: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_TypeDeclaration9528: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypeDeclaration9534: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SequenceType9593: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SequenceType9597: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_SequenceType9646: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_OccurrenceIndicator0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_ItemType9711: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_ItemType9751: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9753: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9755: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ITEM_in_p_ItemType9797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicOrUnionType9883: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DocumentTest_in_p_KindTest9933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_KindTest9945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeTest_in_p_KindTest9957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_KindTest9969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PITest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CommentTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TextTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AnyKindTest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_AnyKindTest10067: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyKindTest10069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyKindTest10071: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_DocumentTest10099: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_DocumentTest10102: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_DocumentTest10110: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_TextTest10136: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TextTest10138: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TextTest10140: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_p_CommentTest10166: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_CommentTest10168: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_CommentTest10170: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_NamespaceNodeTest10198: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_NamespaceNodeTest10200: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_PITest10228: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_PITest10231: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_PITest10235: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_PITest10239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_AttributeTest10265: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AttributeTest10267: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_AttributeTest10273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_AttributeTest10275: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AttributeTest10281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_AttribNameOrWildcard10313: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaAttributeTest10341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaAttributeTest10345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_p_ElementTest10397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ElementTest10399: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ElementTest10405: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ElementTest10407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_ElementTest10409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ElementTest10416: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementNameOrWildcard10442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_ElementNameOrWildcard10446: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaElementTest10466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaElementTest10470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementName_in_p_ElementDeclaration10496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AttributeName10522: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementName10548: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_TypeName10574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_FunctionTest10600: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_AnyFunctionTest10635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyFunctionTest10637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_AnyFunctionTest10639: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyFunctionTest10641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_TypedFunctionTest10667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypedFunctionTest10669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TypedFunctionTest10675: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_TypedFunctionTest10683: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TypedFunctionTest10685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedItemType10713: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedItemType10717: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10768: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10774: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10813: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10819: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_pg_QuotStringLiteralContent10885: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_set_in_pg_AposStringLiteralContent10936: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_p_QName11156: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_QName11168: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_pg_FQName11229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FNCName_in_pg_FQName11241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11285: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_pg_QName11287: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11291: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_ItemType9759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9803: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ITEM_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9847: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicOrUnionType9931: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DocumentTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PITest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CommentTest_in_p_KindTest10053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TextTest_in_p_KindTest10065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AnyKindTest_in_p_KindTest10089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_AnyKindTest10115: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyKindTest10117: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyKindTest10119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_DocumentTest10147: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_DocumentTest10150: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_DocumentTest10158: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_TextTest10184: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TextTest10186: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TextTest10188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_p_CommentTest10214: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_CommentTest10216: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_CommentTest10218: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_NamespaceNodeTest10246: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_NamespaceNodeTest10248: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_PITest10276: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_PITest10279: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_PITest10283: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_PITest10287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_AttributeTest10313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AttributeTest10315: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_AttributeTest10321: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_AttributeTest10323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AttributeTest10329: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_AttribNameOrWildcard10361: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaAttributeTest10389: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaAttributeTest10393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_p_ElementTest10445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ElementTest10447: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ElementTest10453: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ElementTest10455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_ElementTest10457: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ElementTest10464: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementNameOrWildcard10490: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_ElementNameOrWildcard10494: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaElementTest10514: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaElementTest10518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementName_in_p_ElementDeclaration10544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AttributeName10570: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementName10596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_TypeName10622: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_FunctionTest10648: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_AnyFunctionTest10683: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyFunctionTest10685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_AnyFunctionTest10687: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyFunctionTest10689: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_TypedFunctionTest10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypedFunctionTest10717: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TypedFunctionTest10723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_TypedFunctionTest10731: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TypedFunctionTest10733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedItemType10761: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedItemType10765: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10816: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10861: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_pg_QuotStringLiteralContent10933: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_set_in_pg_AposStringLiteralContent10984: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_p_QName11204: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_QName11216: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_pg_FQName11277: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FNCName_in_pg_FQName11289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11333: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_pg_QName11335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_NCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_FNCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_RevalidationDecl13358: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
-    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
-    FOLLOW_STRICT_in_pm_RevalidationDecl13367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_LAX_in_pm_RevalidationDecl13373: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SKIP_in_pm_RevalidationDecl13379: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_InsertExprTargetChoice13414: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
-    FOLLOW_FIRST_in_p_InsertExprTargetChoice13419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_LAST_in_p_InsertExprTargetChoice13425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_INTO_in_p_InsertExprTargetChoice13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AFTER_in_p_InsertExprTargetChoice13449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INSERT_in_p_InsertExpr13495: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_InsertExpr13500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_InsertExpr13506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SourceExpr_in_p_InsertExpr13509: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
-    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_InsertExpr13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DELETE_in_p_DeleteExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_DeleteExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_DeleteExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_DeleteExpr13557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_REPLACE_in_p_ReplaceExpr13587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_VALUE_in_p_ReplaceExpr13592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_ReplaceExpr13596: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ReplaceExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_WITH_in_p_ReplaceExpr13609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RENAME_in_p_RenameExpr13642: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_RenameExpr13646: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_RenameExpr13648: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_RenameExpr13652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NewNameExpr_in_p_RenameExpr13654: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SourceExpr13682: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TargetExpr13709: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_NewNameExpr13736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COPY_in_p_TransformExpr13765: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13769: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13773: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13777: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13779: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TransformExpr13783: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13791: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13795: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_MODIFY_in_p_TransformExpr13804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13806: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TransformExpr13811: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_FTOptionDecl13851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
-    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCORE_in_p_FTScoreVar13889: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_FTScoreVar13895: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_FTScoreVar13899: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_CONTAINS_in_p_FTContainsExpr13933: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_TEXT_in_p_FTContainsExpr13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTContainsExpr13941: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOr_in_p_FTSelection13973: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_p_FTPosFilter_in_p_FTSelection13975: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_WEIGHT_in_p_FTWeight14004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_FTWeight14008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWeight14010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWeight14013: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_FTOR_in_p_FTOr14045: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14049: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_FTAND_in_p_FTAnd14084: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14088: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_NOT_in_p_FTMildNot14123: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_FTMildNot14127: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_FTNOT_in_p_FTUnaryNot14164: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
-    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWords_in_p_FTPrimary14233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
-    FOLLOW_p_FTTimes_in_p_FTPrimary14235: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTPrimary14250: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTPrimary14252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_FTPrimary14254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWordsValue_in_p_FTWords14293: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
-    FOLLOW_p_FTAnyallOption_in_p_FTWords14295: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTWordsValue14322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTWordsValue14335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWordsValue14337: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWordsValue14340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_FTExtensionSelection14367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTExtensionSelection14370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTExtensionSelection14375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANY_in_p_FTAnyallOption14406: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
-    FOLLOW_WORD_in_p_FTAnyallOption14410: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALL_in_p_FTAnyallOption14419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTAnyallOption14421: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PHRASE_in_p_FTAnyallOption14429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OCCURS_in_p_FTTimes14461: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTTimes14463: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
-    FOLLOW_TIMES_in_p_FTTimes14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTRange14500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14520: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTRange14524: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14526: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14544: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_RevalidationDecl13406: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
+    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
+    FOLLOW_STRICT_in_pm_RevalidationDecl13415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_LAX_in_pm_RevalidationDecl13421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SKIP_in_pm_RevalidationDecl13427: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_InsertExprTargetChoice13462: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
+    FOLLOW_FIRST_in_p_InsertExprTargetChoice13467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_LAST_in_p_InsertExprTargetChoice13473: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_INTO_in_p_InsertExprTargetChoice13480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AFTER_in_p_InsertExprTargetChoice13497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INSERT_in_p_InsertExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_InsertExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_InsertExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SourceExpr_in_p_InsertExpr13557: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
+    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_InsertExpr13561: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DELETE_in_p_DeleteExpr13591: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_DeleteExpr13596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_DeleteExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_DeleteExpr13605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_REPLACE_in_p_ReplaceExpr13635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_VALUE_in_p_ReplaceExpr13640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_ReplaceExpr13644: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ReplaceExpr13650: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_WITH_in_p_ReplaceExpr13657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RENAME_in_p_RenameExpr13690: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_RenameExpr13694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_RenameExpr13696: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_RenameExpr13700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NewNameExpr_in_p_RenameExpr13702: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SourceExpr13730: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TargetExpr13757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_NewNameExpr13784: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COPY_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13825: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13827: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TransformExpr13831: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13839: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13843: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_MODIFY_in_p_TransformExpr13852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13854: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TransformExpr13859: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_FTOptionDecl13899: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
+    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCORE_in_p_FTScoreVar13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_FTScoreVar13943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_FTScoreVar13947: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_CONTAINS_in_p_FTContainsExpr13981: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_TEXT_in_p_FTContainsExpr13985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTContainsExpr13989: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOr_in_p_FTSelection14021: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_p_FTPosFilter_in_p_FTSelection14023: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_WEIGHT_in_p_FTWeight14052: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_FTWeight14056: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWeight14058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWeight14061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_FTOR_in_p_FTOr14093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14126: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_FTAND_in_p_FTAnd14132: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14136: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_NOT_in_p_FTMildNot14171: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_FTMildNot14175: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_FTNOT_in_p_FTUnaryNot14212: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
+    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWords_in_p_FTPrimary14281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
+    FOLLOW_p_FTTimes_in_p_FTPrimary14283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTPrimary14298: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTPrimary14300: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_FTPrimary14302: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWordsValue_in_p_FTWords14341: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
+    FOLLOW_p_FTAnyallOption_in_p_FTWords14343: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTWordsValue14370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTWordsValue14383: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWordsValue14385: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWordsValue14388: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_FTExtensionSelection14415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTExtensionSelection14418: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTExtensionSelection14423: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANY_in_p_FTAnyallOption14454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
+    FOLLOW_WORD_in_p_FTAnyallOption14458: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALL_in_p_FTAnyallOption14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTAnyallOption14469: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PHRASE_in_p_FTAnyallOption14477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OCCURS_in_p_FTTimes14509: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTTimes14511: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
+    FOLLOW_TIMES_in_p_FTTimes14515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
     FOLLOW_p_AdditiveExpr_in_p_FTRange14550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTRange14568: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTRange14574: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOrder_in_p_FTPosFilter14607: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWindow_in_p_FTPosFilter14611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDistance_in_p_FTPosFilter14615: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTScope_in_p_FTPosFilter14619: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTContent_in_p_FTPosFilter14623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_FTOrder14651: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WINDOW_in_p_FTWindow14681: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTWindow14685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTWindow14687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DISTANCE_in_p_FTDistance14715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTDistance14719: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTDistance14721: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTUnit14751: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCES_in_p_FTUnit14757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPHS_in_p_FTUnit14763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SAME_in_p_FTScope14796: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_DIFFERENT_in_p_FTScope14802: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_p_FTBigUnit_in_p_FTScope14807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCE_in_p_FTBigUnit14837: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPH_in_p_FTBigUnit14843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14878: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_START_in_p_FTContent14882: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14890: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_FTContent14894: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ENTIRE_in_p_FTContent14902: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTContent14906: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_USING_in_p_FTMatchOptions14940: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
-    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStemOption_in_p_FTMatchOption15008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15087: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTCaseOption15091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTCaseOption15113: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LOWERCASE_in_p_FTCaseOption15130: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UPPERCASE_in_p_FTCaseOption15146: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTStemOption15249: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15289: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15298: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15317: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTThesaurusOption15319: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTThesaurusOption15332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTThesaurusOption15338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTThesaurusOption15356: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15360: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTThesaurusID15393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
-    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
-    FOLLOW_LEVELS_in_p_FTThesaurusID15411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTLiteralRange15446: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15466: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTLiteralRange15470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15490: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14568: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTRange14572: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTRange14596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTRange14616: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14618: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTRange14622: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOrder_in_p_FTPosFilter14655: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWindow_in_p_FTPosFilter14659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDistance_in_p_FTPosFilter14663: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTScope_in_p_FTPosFilter14667: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTContent_in_p_FTPosFilter14671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_FTOrder14699: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WINDOW_in_p_FTWindow14729: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTWindow14733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTWindow14735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DISTANCE_in_p_FTDistance14763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTDistance14767: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTDistance14769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTUnit14799: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCES_in_p_FTUnit14805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPHS_in_p_FTUnit14811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SAME_in_p_FTScope14844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_DIFFERENT_in_p_FTScope14850: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_p_FTBigUnit_in_p_FTScope14855: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCE_in_p_FTBigUnit14885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPH_in_p_FTBigUnit14891: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_START_in_p_FTContent14930: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14938: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_FTContent14942: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ENTIRE_in_p_FTContent14950: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTContent14954: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_USING_in_p_FTMatchOptions14988: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
+    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStemOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15135: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTCaseOption15139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTCaseOption15161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LOWERCASE_in_p_FTCaseOption15178: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UPPERCASE_in_p_FTCaseOption15194: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTStemOption15297: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15337: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15365: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTThesaurusOption15367: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTThesaurusOption15380: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTThesaurusOption15386: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTThesaurusOption15404: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15408: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTThesaurusID15441: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
+    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
+    FOLLOW_LEVELS_in_p_FTThesaurusID15459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15556: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15560: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_STOP_in_p_FTStopWordOption15583: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15587: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_FTStopWordOption15591: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_NO_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15616: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTStopWords15654: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15658: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTStopWords15672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15674: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTStopWords15677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15679: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTStopWords15683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNION_in_p_FTStopWordsInclExcl15715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LANGUAGE_in_p_FTLanguageOption15756: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTWildCardOption15797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OPTION_in_p_FTExtensionOption15834: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_FTExtensionOption15838: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WITHOUT_in_p_FTIgnoreOption15868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTIgnoreOption15872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_Statements15935: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndExpr15963: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_HybridExprSingle_in_p_Hybrid16017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statement_in_p_Hybrid16030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AssignStatement_in_p_Statement16061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BreakStatement_in_p_Statement16073: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContinueStatement_in_p_Statement16085: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExitStatement_in_p_Statement16097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarDeclStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_WhileStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_HybridExprSingle16148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_HybridExprSingle16163: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSimple_in_p_ApplyStatement16213: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ApplyStatement16215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_AssignStatement16243: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_AssignStatement16247: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_AssignStatement16251: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_AssignStatement16253: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_AssignStatement16256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockStatement16282: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockStatement16284: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockStatement16287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockHybrid16313: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockHybrid16315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockHybrid16318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BREAK_in_p_BreakStatement16346: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_BreakStatement16352: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_BreakStatement16356: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CONTINUE_in_p_ContinueStatement16384: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_ContinueStatement16390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ContinueStatement16394: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXIT_in_p_ExitStatement16422: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
-    FOLLOW_RETURNING_in_p_ExitStatement16428: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ExitStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ExitStatement16435: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InitialClause_in_p_FLWORStatement16461: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnStatement16498: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnStatement16502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IF_in_p_IfStatement16531: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfStatement16535: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfStatement16537: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfStatement16540: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfStatement16544: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16548: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfStatement16553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchStatement16586: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchStatement16590: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchStatement16592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchStatement16595: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchStatement16602: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchStatement16608: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchStatement16612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseStatement16642: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseStatement16652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TRY_in_p_TryCatchStatement16685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchStatement16694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryCatchHybrid16732: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchHybrid16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchStatement16785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchStatement16787: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchStatement16790: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchStatement16797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchStatement16804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchStatement16808: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchStatement16816: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseStatement16849: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseStatement16856: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseStatement16860: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_CaseStatement16868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseStatement16872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_CaseStatement16876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_VarDeclStatement16903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_VARIABLE_in_p_VarDeclStatement16908: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16914: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16918: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16926: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_COMMA_in_p_VarDeclStatement16944: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16948: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16952: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_SEMICOLON_in_p_VarDeclStatement16979: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHILE_in_p_WhileStatement17007: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_WhileStatement17011: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_WhileStatement17013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_WhileStatement17016: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_WhileStatement17018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrExpr_in_p_ExprSimple17057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockExpr17098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockExpr17102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_CollectionDecl17133: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_CollectionDecl17137: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
-    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_CollectionTypeDecl17168: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
-    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INDEX_in_p_IndexDecl17211: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexName_in_p_IndexDecl17215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_ON_in_p_IndexDecl17219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODES_in_p_IndexDecl17225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_IndexDecl17233: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_IndexDecl17240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_QName_in_p_IndexName17269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
-    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_IndexKeyTypeDecl17377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicType17409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_IndexKeyCollation17436: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INTEGRITY_in_p_ICDecl17467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
-    FOLLOW_CONSTRAINT_in_p_ICDecl17473: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICDecl17477: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
-    FOLLOW_p_ICCollection_in_p_ICDecl17480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICForeignKey_in_p_ICDecl17484: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ON_in_p_ICCollection17512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICCollection17518: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollection17522: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
-    FOLLOW_p_ICCollSequence_in_p_ICCollection17525: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollNode_in_p_ICCollection17533: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequence17561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequence17565: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequence17571: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollSequence17575: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollSequenceUnique17603: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequenceUnique17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequenceUnique17619: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
-    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICCollSequenceUnique17631: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREACH_in_p_ICCollNode17662: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollNode17668: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollNode17674: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollNode17678: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollNode17684: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollNode17688: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREIGN_in_p_ICForeignKey17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKey17722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_ICForeignKeySource17755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TO_in_p_ICForeignKeyTarget17786: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICForeignKeyValues17825: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKeyValues17841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15538: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTLiteralRange15542: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTLiteralRange15562: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTLiteralRange15566: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15608: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_STOP_in_p_FTStopWordOption15631: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15635: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_FTStopWordOption15639: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_NO_in_p_FTStopWordOption15660: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15664: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTStopWords15702: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15706: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTStopWords15720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTStopWords15725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15727: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTStopWords15731: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNION_in_p_FTStopWordsInclExcl15763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LANGUAGE_in_p_FTLanguageOption15804: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTWildCardOption15845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OPTION_in_p_FTExtensionOption15882: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_FTExtensionOption15886: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WITHOUT_in_p_FTIgnoreOption15916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTIgnoreOption15920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_Statements15983: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndExpr16011: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_HybridExprSingle_in_p_Hybrid16065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statement_in_p_Hybrid16078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AssignStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BreakStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContinueStatement_in_p_Statement16133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExitStatement_in_p_Statement16145: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarDeclStatement_in_p_Statement16157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_WhileStatement_in_p_Statement16169: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_HybridExprSingle16196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_HybridExprSingle16211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSimple_in_p_ApplyStatement16261: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ApplyStatement16263: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_AssignStatement16291: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_AssignStatement16295: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_AssignStatement16299: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_AssignStatement16301: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_AssignStatement16304: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockStatement16330: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockStatement16332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockStatement16335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockHybrid16361: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockHybrid16363: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockHybrid16366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BREAK_in_p_BreakStatement16394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_BreakStatement16400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_BreakStatement16404: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONTINUE_in_p_ContinueStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_ContinueStatement16438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ContinueStatement16442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXIT_in_p_ExitStatement16470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
+    FOLLOW_RETURNING_in_p_ExitStatement16476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ExitStatement16480: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ExitStatement16483: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_InitialClause_in_p_FLWORStatement16509: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnStatement16546: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnStatement16550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IF_in_p_IfStatement16579: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfStatement16583: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfStatement16585: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfStatement16588: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfStatement16592: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16596: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfStatement16601: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchStatement16634: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchStatement16638: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchStatement16640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchStatement16643: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchStatement16650: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchStatement16656: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchStatement16660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseStatement16690: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseStatement16700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TRY_in_p_TryCatchStatement16733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchStatement16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryCatchHybrid16780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchHybrid16790: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchStatement16833: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchStatement16835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchStatement16838: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchStatement16845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchStatement16852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchStatement16856: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseStatement16897: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseStatement16904: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseStatement16908: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseStatement16912: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_CaseStatement16916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseStatement16920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_CaseStatement16924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_VarDeclStatement16951: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_VARIABLE_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement16966: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement16974: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_COMMA_in_p_VarDeclStatement16992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement17000: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement17008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_SEMICOLON_in_p_VarDeclStatement17027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHILE_in_p_WhileStatement17055: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_WhileStatement17059: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_WhileStatement17061: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_WhileStatement17064: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_WhileStatement17066: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrExpr_in_p_ExprSimple17105: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockExpr17146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockExpr17150: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_CollectionDecl17181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_CollectionDecl17185: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
+    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_CollectionTypeDecl17216: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
+    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INDEX_in_p_IndexDecl17259: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexName_in_p_IndexDecl17263: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_ON_in_p_IndexDecl17267: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODES_in_p_IndexDecl17273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_IndexDecl17281: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_IndexDecl17288: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_QName_in_p_IndexName17317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
+    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_IndexKeyTypeDecl17425: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicType17457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_IndexKeyCollation17484: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INTEGRITY_in_p_ICDecl17515: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
+    FOLLOW_CONSTRAINT_in_p_ICDecl17521: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICDecl17525: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
+    FOLLOW_p_ICCollection_in_p_ICDecl17528: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICForeignKey_in_p_ICDecl17532: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ON_in_p_ICCollection17560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICCollection17566: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollection17570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
+    FOLLOW_p_ICCollSequence_in_p_ICCollection17573: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollNode_in_p_ICCollection17581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequence17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequence17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequence17619: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollSequence17623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollSequenceUnique17651: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequenceUnique17661: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequenceUnique17667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
+    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICCollSequenceUnique17679: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREACH_in_p_ICCollNode17710: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollNode17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollNode17722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollNode17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollNode17732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollNode17736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREIGN_in_p_ICForeignKey17764: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKey17770: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_ICForeignKeySource17803: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TO_in_p_ICForeignKeyTarget17834: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17869: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICForeignKeyValues17873: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17883: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKeyValues17889: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_synpred1_XQueryParser3535: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
     FOLLOW_DOLLAR_in_synpred1_XQueryParser3543: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_FOR_in_synpred1_XQueryParser3549: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
@@ -61828,37 +61873,37 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_LPAREN_in_synpred4_XQueryParser3635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_TRY_in_synpred5_XQueryParser3655: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
     FOLLOW_LBRACKET_in_synpred5_XQueryParser3657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_synpred6_XQueryParser6185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
-    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPE_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_synpred7_XQueryParser6549: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred8_XQueryParser6665: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6718: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_synpred9_XQueryParser6726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6729: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6747: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred9_XQueryParser6755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6758: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6776: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6788: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_synpred10_XQueryParser6818: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_synpred11_XQueryParser6837: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred11_XQueryParser6839: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred14_XQueryParser7315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_synpred14_XQueryParser7317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred15_XQueryParser7335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred16_XQueryParser7591: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
+    FOLLOW_VALIDATE_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
+    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPE_in_synpred6_XQueryParser6197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_synpred7_XQueryParser6553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred8_XQueryParser6669: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_synpred9_XQueryParser6730: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6733: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6751: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred9_XQueryParser6759: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6762: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6792: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_synpred10_XQueryParser6822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_synpred11_XQueryParser6841: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred11_XQueryParser6843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred14_XQueryParser7319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_synpred14_XQueryParser7321: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred15_XQueryParser7339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred16_XQueryParser7595: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
 });
 
 })();
 exports.XQueryParser = XQueryParser;
 });define('ace/mode/xquery/StringLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-20 08:26:29
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-23 09:26:59
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -63543,7 +63588,7 @@ org.antlr.lang.extend(StringLexer.DFA8, org.antlr.runtime.DFA, {
 })();
 exports.StringLexer = StringLexer;
 });define('ace/mode/xquery/XMLLexer', ['require', 'exports', 'module' , 'ace/mode/xquery/antlr3-all', 'ace/mode/xquery/XQDTLexer'], function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-20 08:26:30
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-23 09:27:01
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -66679,8 +66724,9 @@ define('ace/mode/xquery/XQuerySemanticHighlighter', ['require', 'exports', 'modu
         }
         //Check if the tokenized line is equal to the original one:
         if(sourceLine == tokenizedLine) {
-          result[i] = { line: sourceLine, startState: previousState, tokens: { tokens: lineTokens, state: nextState } };
+          result[i] = { tokens: lineTokens, state: nextState };
         } else {
+          result[i] = undefined; 
         }
       }
       return result;
diff --git a/lib/ace/mode/xquery.js b/lib/ace/mode/xquery.js
index dd1249d6..0ed565df 100644
--- a/lib/ace/mode/xquery.js
+++ b/lib/ace/mode/xquery.js
@@ -41,12 +41,13 @@ define(function(require, exports, module) {
 var WorkerClient = require("../worker/worker_client").WorkerClient;
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var XQueryTokenizer = require("./xquery_tokenizer").XQueryTokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
 var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
 var Range = require("../range").Range;
 
 var Mode = function(parent) {
-    this.$tokenizer = new XQueryTokenizer();
+    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
     this.$behaviour = new XQueryBehaviour(parent);
 };
 
@@ -116,11 +117,22 @@ oop.inherits(Mode, TextMode);
         }
     };
     
+    this.deltas = [];
+
     this.createWorker = function(session) {
         var worker = new WorkerClient(["ace"], "worker-xquery.js", "ace/mode/xquery_worker", "XQueryWorker");
-        var self = this;
+        var that = this;
+
+        session.getDocument().on('change', function(evt){
+          that.deltas.push(evt.data);
+        });
+        
         worker.attachToDocument(session.getDocument());
         
+        worker.on("start", function(e) {
+          that.deltas = [];
+        });
+
         worker.on("error", function(e) {
           session.setAnnotations([e.data]);
         });
@@ -130,15 +142,47 @@ oop.inherits(Mode, TextMode);
         });
         
         worker.on("highlight", function(tokens) {
-          self.$tokenizer.cache = tokens.data;
           var firstRow = 0;
           var lastRow = session.getLength() - 1;
-          var currentLineIndex = session.bgTokenizer.currentLine;
-          var currentLine = session.bgTokenizer.lines[currentLineIndex];
-          session.bgTokenizer.lines = [];
-          session.bgTokenizer.lines[currentLineIndex] = currentLine;
+          
+          var lines = tokens.data;
+          
+          for(var i in that.deltas)
+          {
+            var delta = that.deltas[i];
+            if (delta.action === "insertLines")
+            {
+              var newLineCount = delta.range.end.row - delta.range.start.row;
+              this.$insertNewRows(delta.range.start.row, newLineCount);
+              for (var i = 0; i < newLineCount; i++) {
+                lines.splice(delta.range.start.row + i, 0, undefined);
+              }
+            }
+            else if (delta.action === "insertText")
+            {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0, undefined);
+              } else {
+                delete lines[delta.range.start.row];
+              } 
+            } else if (delta.action === "removeLines") {
+              var oldLineCount = delta.range.end.row - delta.range.start.row;
+              lines.splice(delta.range.start.row, oldLineCount);
+            } else if (delta.action === "removeText") {
+              if (session.getDocument().isNewLine(delta.text))
+              {
+                lines.splice(delta.range.start.row, 0);
+              } else {
+                delete lines[delta.range.start.row];
+              }
+            }           
+          }
+          
+          session.bgTokenizer.lines = lines;
           session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
         });
+        
         return worker;
     };
     
diff --git a/lib/ace/mode/xquery/StringLexer.js b/lib/ace/mode/xquery/StringLexer.js
index cc8f51a8..178361ee 100644
--- a/lib/ace/mode/xquery/StringLexer.js
+++ b/lib/ace/mode/xquery/StringLexer.js
@@ -1,5 +1,5 @@
 define(function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-20 08:26:29
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/StringLexer.g 2012-04-23 09:26:59
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/lib/ace/mode/xquery/XMLLexer.js b/lib/ace/mode/xquery/XMLLexer.js
index 3311cbe4..44a1092f 100644
--- a/lib/ace/mode/xquery/XMLLexer.js
+++ b/lib/ace/mode/xquery/XMLLexer.js
@@ -1,5 +1,5 @@
 define(function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-20 08:26:30
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XMLLexer.g 2012-04-23 09:27:01
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/lib/ace/mode/xquery/XQueryLexer.js b/lib/ace/mode/xquery/XQueryLexer.js
index c479a72f..b728f90e 100644
--- a/lib/ace/mode/xquery/XQueryLexer.js
+++ b/lib/ace/mode/xquery/XQueryLexer.js
@@ -1,5 +1,5 @@
 define(function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-20 08:26:27
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryLexer.g 2012-04-23 09:26:57
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/lib/ace/mode/xquery/XQueryParser.js b/lib/ace/mode/xquery/XQueryParser.js
index aa6b5471..246f0290 100644
--- a/lib/ace/mode/xquery/XQueryParser.js
+++ b/lib/ace/mode/xquery/XQueryParser.js
@@ -1,5 +1,5 @@
 define(function(require, exports, module) {
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-20 08:26:36
+// $ANTLR 3.3 Nov 30, 2010 12:50:56 xquery/XQueryParser.g 2012-04-23 09:27:07
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -59,6 +59,8 @@ var XQueryParser = function(input, state) {
     (function(){
 
 
+        this.isInAttr = false;
+
         this.errors = [];
 
         this.hasErrors = function(){
@@ -927,7 +929,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:293:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
+    // xquery/XQueryParser.g:295:1: p_Module : (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF ;
     // $ANTLR start "p_Module"
     p_Module: function() {
         var retval = new XQueryParser.p_Module_return();
@@ -946,14 +948,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_LibraryModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_LibraryModule");
         var stream_p_MainModule=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_MainModule");
         try {
-            // xquery/XQueryParser.g:294:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
-            // xquery/XQueryParser.g:294:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
-            // xquery/XQueryParser.g:294:13: (vd= p_VersionDecl )?
+            // xquery/XQueryParser.g:296:9: ( (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF )
+            // xquery/XQueryParser.g:296:11: (vd= p_VersionDecl )? (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->) EOF
+            // xquery/XQueryParser.g:296:13: (vd= p_VersionDecl )?
             var alt1=2;
             alt1 = this.dfa1.predict(this.input);
             switch (alt1) {
                 case 1 :
-                    // xquery/XQueryParser.g:294:13: vd= p_VersionDecl
+                    // xquery/XQueryParser.g:296:13: vd= p_VersionDecl
                     this.pushFollow(XQueryParser.FOLLOW_p_VersionDecl_in_p_Module507);
                     vd=this.p_VersionDecl();
 
@@ -966,12 +968,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
+            // xquery/XQueryParser.g:297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)
             var alt2=2;
             alt2 = this.dfa2.predict(this.input);
             switch (alt2) {
                 case 1 :
-                    // xquery/XQueryParser.g:296:15: lm= p_LibraryModule[$vd.tree]
+                    // xquery/XQueryParser.g:298:15: lm= p_LibraryModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_LibraryModule_in_p_Module540);
                     lm=this.p_LibraryModule((vd?vd.tree:null));
 
@@ -991,7 +993,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 296:44: ->
+                    // 298:44: ->
                     {
                         this.adaptor.addChild(root_0, (lm?lm.tree:null));
 
@@ -1001,7 +1003,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:297:15: mm= p_MainModule[$vd.tree]
+                    // xquery/XQueryParser.g:299:15: mm= p_MainModule[$vd.tree]
                     this.pushFollow(XQueryParser.FOLLOW_p_MainModule_in_p_Module563);
                     mm=this.p_MainModule((vd?vd.tree:null));
 
@@ -1021,7 +1023,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 297:44: ->
+                    // 299:44: ->
                     {
                         this.adaptor.addChild(root_0, (mm?mm.tree:null));
 
@@ -1072,7 +1074,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:302:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
+    // xquery/XQueryParser.g:304:1: p_VersionDecl : k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) ;
     // $ANTLR start "p_VersionDecl"
     p_VersionDecl: function() {
         var retval = new XQueryParser.p_VersionDecl_return();
@@ -1093,15 +1095,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_XQUERY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token XQUERY");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:303:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
-            // xquery/XQueryParser.g:303:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:305:9: (k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) ) )
+            // xquery/XQueryParser.g:305:11: k= XQUERY ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) ) SEMICOLON
             k=this.match(this.input,XQUERY,XQueryParser.FOLLOW_XQUERY_in_p_VersionDecl615); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_XQUERY.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:303:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
+            // xquery/XQueryParser.g:305:35: ( (k= ENCODING enc= p_StringLiteral ) | (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? ) )
             var alt4=2;
             var LA4_0 = this.input.LA(1);
 
@@ -1120,9 +1122,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt4) {
                 case 1 :
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:36: (k= ENCODING enc= p_StringLiteral )
-                    // xquery/XQueryParser.g:303:37: k= ENCODING enc= p_StringLiteral
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:36: (k= ENCODING enc= p_StringLiteral )
+                    // xquery/XQueryParser.g:305:37: k= ENCODING enc= p_StringLiteral
                     k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl623); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -1142,9 +1144,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
-                    // xquery/XQueryParser.g:304:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:13: (k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )? )
+                    // xquery/XQueryParser.g:306:14: k= VERSION ver= p_StringLiteral (k= ENCODING enc= p_StringLiteral )?
                     k=this.match(this.input,VERSION,XQueryParser.FOLLOW_VERSION_in_p_VersionDecl650); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_VERSION.add(k);
 
@@ -1157,7 +1159,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(ver.getTree());
-                    // xquery/XQueryParser.g:304:59: (k= ENCODING enc= p_StringLiteral )?
+                    // xquery/XQueryParser.g:306:59: (k= ENCODING enc= p_StringLiteral )?
                     var alt3=2;
                     var LA3_0 = this.input.LA(1);
 
@@ -1166,7 +1168,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt3) {
                         case 1 :
-                            // xquery/XQueryParser.g:304:60: k= ENCODING enc= p_StringLiteral
+                            // xquery/XQueryParser.g:306:60: k= ENCODING enc= p_StringLiteral
                             k=this.match(this.input,ENCODING,XQueryParser.FOLLOW_ENCODING_in_p_VersionDecl661); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_ENCODING.add(k);
 
@@ -1200,7 +1202,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: enc, ver
+            // elements: ver, enc
             // token labels: 
             // rule labels: retval, ver, enc
             // token list labels: 
@@ -1212,19 +1214,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_enc=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token enc",enc!=null?enc.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 305:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+            // 307:17: -> ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
             {
-                // xquery/XQueryParser.g:305:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
+                // xquery/XQueryParser.g:307:20: ^( VersionDecl ^( VersionDeclVersion ( $ver)? ) ^( VersionDeclEncoding ( $enc)? ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VersionDecl, "VersionDecl"), root_1);
 
-                // xquery/XQueryParser.g:305:34: ^( VersionDeclVersion ( $ver)? )
+                // xquery/XQueryParser.g:307:34: ^( VersionDeclVersion ( $ver)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclVersion, "VersionDeclVersion"), root_2);
 
-                // xquery/XQueryParser.g:305:55: ( $ver)?
+                // xquery/XQueryParser.g:307:55: ( $ver)?
                 if ( stream_ver.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ver.nextTree());
 
@@ -1233,12 +1235,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:305:62: ^( VersionDeclEncoding ( $enc)? )
+                // xquery/XQueryParser.g:307:62: ^( VersionDeclEncoding ( $enc)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VersionDeclEncoding, "VersionDeclEncoding"), root_2);
 
-                // xquery/XQueryParser.g:305:84: ( $enc)?
+                // xquery/XQueryParser.g:307:84: ( $enc)?
                 if ( stream_enc.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_enc.nextTree());
 
@@ -1289,7 +1291,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:309:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
+    // xquery/XQueryParser.g:311:1: p_MainModule[vd] : pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) ;
     // $ANTLR start "p_MainModule"
     p_MainModule: function(vd) {
         var retval = new XQueryParser.p_MainModule_return();
@@ -1303,8 +1305,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_QueryBody=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_QueryBody");
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         try {
-            // xquery/XQueryParser.g:310:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
-            // xquery/XQueryParser.g:310:11: pm_Prolog pm_QueryBody
+            // xquery/XQueryParser.g:312:9: ( pm_Prolog pm_QueryBody -> ^( MainModule pm_Prolog ) )
+            // xquery/XQueryParser.g:312:11: pm_Prolog pm_QueryBody
             this.pushFollow(XQueryParser.FOLLOW_pm_Prolog_in_p_MainModule739);
             pm_Prolog3=this.pm_Prolog();
 
@@ -1330,9 +1332,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 311:17: -> ^( MainModule pm_Prolog )
+            // 313:17: -> ^( MainModule pm_Prolog )
             {
-                // xquery/XQueryParser.g:311:20: ^( MainModule pm_Prolog )
+                // xquery/XQueryParser.g:313:20: ^( MainModule pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(MainModule, "MainModule"), root_1);
@@ -1381,7 +1383,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:315:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
+    // xquery/XQueryParser.g:317:1: p_LibraryModule[vd] : p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) ;
     // $ANTLR start "p_LibraryModule"
     p_LibraryModule: function(vd) {
         var retval = new XQueryParser.p_LibraryModule_return();
@@ -1395,8 +1397,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_Prolog=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_Prolog");
         var stream_p_ModuleDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ModuleDecl");
         try {
-            // xquery/XQueryParser.g:316:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
-            // xquery/XQueryParser.g:316:11: p_ModuleDecl pm_Prolog
+            // xquery/XQueryParser.g:318:9: ( p_ModuleDecl pm_Prolog -> ^( LibraryModule p_ModuleDecl pm_Prolog ) )
+            // xquery/XQueryParser.g:318:11: p_ModuleDecl pm_Prolog
             this.pushFollow(XQueryParser.FOLLOW_p_ModuleDecl_in_p_LibraryModule797);
             p_ModuleDecl5=this.p_ModuleDecl();
 
@@ -1412,7 +1414,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_ModuleDecl, pm_Prolog
+            // elements: pm_Prolog, p_ModuleDecl
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1422,9 +1424,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 317:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
+            // 319:17: -> ^( LibraryModule p_ModuleDecl pm_Prolog )
             {
-                // xquery/XQueryParser.g:317:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
+                // xquery/XQueryParser.g:319:20: ^( LibraryModule p_ModuleDecl pm_Prolog )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(LibraryModule, "LibraryModule"), root_1);
@@ -1474,7 +1476,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:321:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
+    // xquery/XQueryParser.g:323:1: p_ModuleDecl : k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) ;
     // $ANTLR start "p_ModuleDecl"
     p_ModuleDecl: function() {
         var retval = new XQueryParser.p_ModuleDecl_return();
@@ -1499,8 +1501,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:322:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
-            // xquery/XQueryParser.g:322:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:324:9: (k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON -> ^( ModuleDecl p_NCName p_StringLiteral ) )
+            // xquery/XQueryParser.g:324:11: k+= MODULE k+= NAMESPACE p_NCName EQUAL p_StringLiteral SEMICOLON
             k=this.match(this.input,MODULE,XQueryParser.FOLLOW_MODULE_in_p_ModuleDecl855); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_MODULE.add(k);
 
@@ -1547,9 +1549,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 323:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
+            // 325:17: -> ^( ModuleDecl p_NCName p_StringLiteral )
             {
-                // xquery/XQueryParser.g:323:21: ^( ModuleDecl p_NCName p_StringLiteral )
+                // xquery/XQueryParser.g:325:21: ^( ModuleDecl p_NCName p_StringLiteral )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleDecl, "ModuleDecl"), root_1);
@@ -1598,7 +1600,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:329:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
+    // xquery/XQueryParser.g:331:1: pm_Prolog : ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) ;
     // $ANTLR start "pm_Prolog"
     pm_Prolog: function() {
         var retval = new XQueryParser.pm_Prolog_return();
@@ -1625,17 +1627,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_OrderedDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_OrderedDecl");
         var stream_pm_FTOptionDecl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_FTOptionDecl");
         try {
-            // xquery/XQueryParser.g:330:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
-            // xquery/XQueryParser.g:330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
+            // xquery/XQueryParser.g:332:9: ( ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )* -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) ) )
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )* (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*
             loop6:
             do {
                 var alt6=2;
                 alt6 = this.dfa6.predict(this.input);
                 switch (alt6) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
-                    // xquery/XQueryParser.g:330:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
+                    // xquery/XQueryParser.g:332:12: (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl )
                     var alt5=5;
                     var LA5_0 = this.input.LA(1);
 
@@ -1691,7 +1693,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt5) {
                         case 1 :
-                            // xquery/XQueryParser.g:330:13: dnd+= pm_DefaultNamespaceDecl
+                            // xquery/XQueryParser.g:332:13: dnd+= pm_DefaultNamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_DefaultNamespaceDecl_in_pm_Prolog928);
                             dnd=this.pm_DefaultNamespaceDecl();
 
@@ -1705,7 +1707,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:330:44: s+= p_Setter
+                            // xquery/XQueryParser.g:332:44: s+= p_Setter
                             this.pushFollow(XQueryParser.FOLLOW_p_Setter_in_pm_Prolog934);
                             s=this.p_Setter();
 
@@ -1719,7 +1721,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:330:58: nd+= pm_NamespaceDecl
+                            // xquery/XQueryParser.g:332:58: nd+= pm_NamespaceDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_NamespaceDecl_in_pm_Prolog940);
                             nd=this.pm_NamespaceDecl();
 
@@ -1733,7 +1735,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 4 :
-                            // xquery/XQueryParser.g:330:81: i+= p_Import
+                            // xquery/XQueryParser.g:332:81: i+= p_Import
                             this.pushFollow(XQueryParser.FOLLOW_p_Import_in_pm_Prolog946);
                             i=this.p_Import();
 
@@ -1747,7 +1749,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 5 :
-                            // xquery/XQueryParser.g:330:95: fto+= pm_FTOptionDecl
+                            // xquery/XQueryParser.g:332:95: fto+= pm_FTOptionDecl
                             this.pushFollow(XQueryParser.FOLLOW_pm_FTOptionDecl_in_pm_Prolog952);
                             fto=this.pm_FTOptionDecl();
 
@@ -1772,7 +1774,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:330:121: (od+= pg_OrderedDecl )*
+            // xquery/XQueryParser.g:332:121: (od+= pg_OrderedDecl )*
             loop7:
             do {
                 var alt7=2;
@@ -1791,7 +1793,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt7) {
                 case 1 :
-                    // xquery/XQueryParser.g:330:121: od+= pg_OrderedDecl
+                    // xquery/XQueryParser.g:332:121: od+= pg_OrderedDecl
                     this.pushFollow(XQueryParser.FOLLOW_pg_OrderedDecl_in_pm_Prolog959);
                     od=this.pg_OrderedDecl();
 
@@ -1813,7 +1815,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nd, i, s, od, fto, dnd
+            // elements: s, nd, dnd, fto, od, i
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1828,19 +1830,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_dnd=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token dnd",list_dnd);
             var stream_i=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token i",list_i);
             root_0 = this.adaptor.nil();
-            // 331:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+            // 333:17: -> ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
             {
-                // xquery/XQueryParser.g:331:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
+                // xquery/XQueryParser.g:333:21: ^( Prolog ^( DefaultNamespaceDecls ( $dnd)* ) ^( Setters ( $s)* ) ^( NamespaceDecls ( $nd)* ) ^( Imports ( $i)* ) ^( FTOptionDecls ( $fto)* ) ^( OrderedDecls ( $od)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Prolog, "Prolog"), root_1);
 
-                // xquery/XQueryParser.g:332:33: ^( DefaultNamespaceDecls ( $dnd)* )
+                // xquery/XQueryParser.g:334:33: ^( DefaultNamespaceDecls ( $dnd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DefaultNamespaceDecls, "DefaultNamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:332:57: ( $dnd)*
+                // xquery/XQueryParser.g:334:57: ( $dnd)*
                 while ( stream_dnd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_dnd.nextTree());
 
@@ -1849,12 +1851,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:333:33: ^( Setters ( $s)* )
+                // xquery/XQueryParser.g:335:33: ^( Setters ( $s)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Setters, "Setters"), root_2);
 
-                // xquery/XQueryParser.g:333:43: ( $s)*
+                // xquery/XQueryParser.g:335:43: ( $s)*
                 while ( stream_s.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_s.nextTree());
 
@@ -1863,12 +1865,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:334:33: ^( NamespaceDecls ( $nd)* )
+                // xquery/XQueryParser.g:336:33: ^( NamespaceDecls ( $nd)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecls, "NamespaceDecls"), root_2);
 
-                // xquery/XQueryParser.g:334:50: ( $nd)*
+                // xquery/XQueryParser.g:336:50: ( $nd)*
                 while ( stream_nd.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nd.nextTree());
 
@@ -1877,12 +1879,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:335:33: ^( Imports ( $i)* )
+                // xquery/XQueryParser.g:337:33: ^( Imports ( $i)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(Imports, "Imports"), root_2);
 
-                // xquery/XQueryParser.g:335:43: ( $i)*
+                // xquery/XQueryParser.g:337:43: ( $i)*
                 while ( stream_i.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_i.nextTree());
 
@@ -1891,12 +1893,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:336:33: ^( FTOptionDecls ( $fto)* )
+                // xquery/XQueryParser.g:338:33: ^( FTOptionDecls ( $fto)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(FTOptionDecls, "FTOptionDecls"), root_2);
 
-                // xquery/XQueryParser.g:336:49: ( $fto)*
+                // xquery/XQueryParser.g:338:49: ( $fto)*
                 while ( stream_fto.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_fto.nextTree());
 
@@ -1905,12 +1907,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:337:33: ^( OrderedDecls ( $od)* )
+                // xquery/XQueryParser.g:339:33: ^( OrderedDecls ( $od)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(OrderedDecls, "OrderedDecls"), root_2);
 
-                // xquery/XQueryParser.g:337:48: ( $od)*
+                // xquery/XQueryParser.g:339:48: ( $od)*
                 while ( stream_od.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_od.nextTree());
 
@@ -1961,7 +1963,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:345:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
+    // xquery/XQueryParser.g:347:1: pg_OrderedDecl : ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl );
     // $ANTLR start "pg_OrderedDecl"
     pg_OrderedDecl: function() {
         var retval = new XQueryParser.pg_OrderedDecl_return();
@@ -1975,7 +1977,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:346:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
+            // xquery/XQueryParser.g:348:9: ( pm_ContextItemDecl | pm_AnnotatedDecl | pm_OptionDecl )
             var alt8=3;
             var LA8_0 = this.input.LA(1);
 
@@ -2014,7 +2016,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt8) {
                 case 1 :
-                    // xquery/XQueryParser.g:346:11: pm_ContextItemDecl
+                    // xquery/XQueryParser.g:348:11: pm_ContextItemDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ContextItemDecl_in_pg_OrderedDecl1274);
@@ -2027,7 +2029,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:347:11: pm_AnnotatedDecl
+                    // xquery/XQueryParser.g:349:11: pm_AnnotatedDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_AnnotatedDecl_in_pg_OrderedDecl1286);
@@ -2040,7 +2042,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:348:11: pm_OptionDecl
+                    // xquery/XQueryParser.g:350:11: pm_OptionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OptionDecl_in_pg_OrderedDecl1298);
@@ -2087,7 +2089,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
+    // xquery/XQueryParser.g:358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );
     // $ANTLR start "p_Setter"
     p_Setter: function() {
         var retval = new XQueryParser.p_Setter_return();
@@ -2107,12 +2109,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:357:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
+            // xquery/XQueryParser.g:359:9: ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl )
             var alt9=9;
             alt9 = this.dfa9.predict(this.input);
             switch (alt9) {
                 case 1 :
-                    // xquery/XQueryParser.g:357:11: pm_BoundarySpaceDecl
+                    // xquery/XQueryParser.g:359:11: pm_BoundarySpaceDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BoundarySpaceDecl_in_p_Setter1328);
@@ -2125,7 +2127,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:358:11: pm_DefaultCollationDecl
+                    // xquery/XQueryParser.g:360:11: pm_DefaultCollationDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DefaultCollationDecl_in_p_Setter1340);
@@ -2138,7 +2140,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:359:11: pm_BaseURIDecl
+                    // xquery/XQueryParser.g:361:11: pm_BaseURIDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_BaseURIDecl_in_p_Setter1352);
@@ -2151,7 +2153,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:360:11: pm_ConstructionDecl
+                    // xquery/XQueryParser.g:362:11: pm_ConstructionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ConstructionDecl_in_p_Setter1364);
@@ -2164,7 +2166,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:361:11: pm_OrderingModeDecl
+                    // xquery/XQueryParser.g:363:11: pm_OrderingModeDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_OrderingModeDecl_in_p_Setter1376);
@@ -2177,7 +2179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:362:11: pm_EmptyOrderDecl
+                    // xquery/XQueryParser.g:364:11: pm_EmptyOrderDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_EmptyOrderDecl_in_p_Setter1388);
@@ -2190,7 +2192,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:363:11: {...}? => pm_RevalidationDecl
+                    // xquery/XQueryParser.g:365:11: {...}? => pm_RevalidationDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
@@ -2207,7 +2209,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:364:11: pm_CopyNamespacesDecl
+                    // xquery/XQueryParser.g:366:11: pm_CopyNamespacesDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_CopyNamespacesDecl_in_p_Setter1415);
@@ -2220,7 +2222,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:365:11: pm_DecimalFormatDecl
+                    // xquery/XQueryParser.g:367:11: pm_DecimalFormatDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_DecimalFormatDecl_in_p_Setter1427);
@@ -2267,7 +2269,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:369:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:371:1: pm_BoundarySpaceDecl : k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON ;
     // $ANTLR start "pm_BoundarySpaceDecl"
     pm_BoundarySpaceDecl: function() {
         var retval = new XQueryParser.pm_BoundarySpaceDecl_return();
@@ -2282,8 +2284,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON23_tree=null;
 
         try {
-            // xquery/XQueryParser.g:370:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
-            // xquery/XQueryParser.g:370:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
+            // xquery/XQueryParser.g:372:9: (k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON )
+            // xquery/XQueryParser.g:372:11: k= DECLARE k= BOUNDARY_SPACE ( (k= PRESERVE ) | (k= STRIP ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BoundarySpaceDecl1459); if (this.state.failed) return retval;
@@ -2302,7 +2304,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:370:68: ( (k= PRESERVE ) | (k= STRIP ) )
+            // xquery/XQueryParser.g:372:68: ( (k= PRESERVE ) | (k= STRIP ) )
             var alt10=2;
             var LA10_0 = this.input.LA(1);
 
@@ -2321,9 +2323,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt10) {
                 case 1 :
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:70: (k= PRESERVE )
-                    // xquery/XQueryParser.g:370:71: k= PRESERVE
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:70: (k= PRESERVE )
+                    // xquery/XQueryParser.g:372:71: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_BoundarySpaceDecl1474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2339,9 +2341,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:100: (k= STRIP )
-                    // xquery/XQueryParser.g:370:101: k= STRIP
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:100: (k= STRIP )
+                    // xquery/XQueryParser.g:372:101: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_BoundarySpaceDecl1484); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2400,7 +2402,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:374:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:376:1: pm_DefaultCollationDecl : k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultCollationDecl"
     pm_DefaultCollationDecl: function() {
         var retval = new XQueryParser.pm_DefaultCollationDecl_return();
@@ -2416,8 +2418,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON25_tree=null;
 
         try {
-            // xquery/XQueryParser.g:375:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:375:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:377:9: (k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:377:11: k= DECLARE k= DEFAULT k= COLLATION p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultCollationDecl1519); if (this.state.failed) return retval;
@@ -2491,7 +2493,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:379:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
+    // xquery/XQueryParser.g:381:1: pm_BaseURIDecl : k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) ;
     // $ANTLR start "pm_BaseURIDecl"
     pm_BaseURIDecl: function() {
         var retval = new XQueryParser.pm_BaseURIDecl_return();
@@ -2510,8 +2512,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_BASE_URI=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BASE_URI");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:380:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
-            // xquery/XQueryParser.g:380:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:382:9: (k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON -> ^( BaseURIDecl $sl) )
+            // xquery/XQueryParser.g:382:11: k= DECLARE k= BASE_URI sl= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_BaseURIDecl1573); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -2547,9 +2549,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 381:17: -> ^( BaseURIDecl $sl)
+            // 383:17: -> ^( BaseURIDecl $sl)
             {
-                // xquery/XQueryParser.g:381:20: ^( BaseURIDecl $sl)
+                // xquery/XQueryParser.g:383:20: ^( BaseURIDecl $sl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(BaseURIDecl, "BaseURIDecl"), root_1);
@@ -2597,7 +2599,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:385:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:387:1: pm_ConstructionDecl : k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON ;
     // $ANTLR start "pm_ConstructionDecl"
     pm_ConstructionDecl: function() {
         var retval = new XQueryParser.pm_ConstructionDecl_return();
@@ -2612,8 +2614,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON27_tree=null;
 
         try {
-            // xquery/XQueryParser.g:386:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
-            // xquery/XQueryParser.g:386:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
+            // xquery/XQueryParser.g:388:9: (k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON )
+            // xquery/XQueryParser.g:388:11: k= DECLARE k= CONSTRUCTION ( (k= STRIP | k= PRESERVE ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ConstructionDecl1640); if (this.state.failed) return retval;
@@ -2632,9 +2634,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:386:66: ( (k= STRIP | k= PRESERVE ) )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
-            // xquery/XQueryParser.g:386:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:66: ( (k= STRIP | k= PRESERVE ) )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
+            // xquery/XQueryParser.g:388:68: (k= STRIP | k= PRESERVE )
             var alt11=2;
             var LA11_0 = this.input.LA(1);
 
@@ -2653,7 +2655,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt11) {
                 case 1 :
-                    // xquery/XQueryParser.g:386:69: k= STRIP
+                    // xquery/XQueryParser.g:388:69: k= STRIP
                     k=this.match(this.input,STRIP,XQueryParser.FOLLOW_STRIP_in_pm_ConstructionDecl1655); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2663,7 +2665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:386:79: k= PRESERVE
+                    // xquery/XQueryParser.g:388:79: k= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_pm_ConstructionDecl1661); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2722,7 +2724,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:390:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:392:1: pm_OrderingModeDecl : k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON ;
     // $ANTLR start "pm_OrderingModeDecl"
     pm_OrderingModeDecl: function() {
         var retval = new XQueryParser.pm_OrderingModeDecl_return();
@@ -2737,8 +2739,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON28_tree=null;
 
         try {
-            // xquery/XQueryParser.g:391:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
-            // xquery/XQueryParser.g:391:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
+            // xquery/XQueryParser.g:393:9: (k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON )
+            // xquery/XQueryParser.g:393:11: k= DECLARE k= ORDERING ( (k= ORDERED | k= UNORDERED ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OrderingModeDecl1696); if (this.state.failed) return retval;
@@ -2757,9 +2759,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:391:62: ( (k= ORDERED | k= UNORDERED ) )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
-            // xquery/XQueryParser.g:391:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:62: ( (k= ORDERED | k= UNORDERED ) )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
+            // xquery/XQueryParser.g:393:64: (k= ORDERED | k= UNORDERED )
             var alt12=2;
             var LA12_0 = this.input.LA(1);
 
@@ -2778,7 +2780,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt12) {
                 case 1 :
-                    // xquery/XQueryParser.g:391:65: k= ORDERED
+                    // xquery/XQueryParser.g:393:65: k= ORDERED
                     k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_pm_OrderingModeDecl1711); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2788,7 +2790,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:391:77: k= UNORDERED
+                    // xquery/XQueryParser.g:393:77: k= UNORDERED
                     k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_pm_OrderingModeDecl1717); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2847,7 +2849,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:395:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:397:1: pm_EmptyOrderDecl : k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON ;
     // $ANTLR start "pm_EmptyOrderDecl"
     pm_EmptyOrderDecl: function() {
         var retval = new XQueryParser.pm_EmptyOrderDecl_return();
@@ -2862,8 +2864,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON29_tree=null;
 
         try {
-            // xquery/XQueryParser.g:396:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
-            // xquery/XQueryParser.g:396:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
+            // xquery/XQueryParser.g:398:9: (k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON )
+            // xquery/XQueryParser.g:398:11: k= DECLARE k= DEFAULT k= ORDER k= EMPTY ( (k= GREATEST | k= LEAST ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_EmptyOrderDecl1752); if (this.state.failed) return retval;
@@ -2898,9 +2900,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:396:107: ( (k= GREATEST | k= LEAST ) )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
-            // xquery/XQueryParser.g:396:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:107: ( (k= GREATEST | k= LEAST ) )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
+            // xquery/XQueryParser.g:398:109: (k= GREATEST | k= LEAST )
             var alt13=2;
             var LA13_0 = this.input.LA(1);
 
@@ -2919,7 +2921,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt13) {
                 case 1 :
-                    // xquery/XQueryParser.g:396:110: k= GREATEST
+                    // xquery/XQueryParser.g:398:110: k= GREATEST
                     k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_pm_EmptyOrderDecl1779); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2929,7 +2931,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:396:123: k= LEAST
+                    // xquery/XQueryParser.g:398:123: k= LEAST
                     k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_pm_EmptyOrderDecl1785); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -2988,7 +2990,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:400:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
+    // xquery/XQueryParser.g:402:1: pm_CopyNamespacesDecl : k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON ;
     // $ANTLR start "pm_CopyNamespacesDecl"
     pm_CopyNamespacesDecl: function() {
         var retval = new XQueryParser.pm_CopyNamespacesDecl_return();
@@ -3007,8 +3009,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON33_tree=null;
 
         try {
-            // xquery/XQueryParser.g:401:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
-            // xquery/XQueryParser.g:401:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
+            // xquery/XQueryParser.g:403:9: (k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON )
+            // xquery/XQueryParser.g:403:11: k= DECLARE k= COPY_NAMESPACES p_PreserveMode COMMA p_InheritMode SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_CopyNamespacesDecl1820); if (this.state.failed) return retval;
@@ -3085,7 +3087,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:405:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
+    // xquery/XQueryParser.g:407:1: p_PreserveMode : (k+= PRESERVE | k+= NO_PRESERVE ) ;
     // $ANTLR start "p_PreserveMode"
     p_PreserveMode: function() {
         var retval = new XQueryParser.p_PreserveMode_return();
@@ -3099,11 +3101,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:406:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:9: ( (k+= PRESERVE | k+= NO_PRESERVE ) )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:406:11: (k+= PRESERVE | k+= NO_PRESERVE )
+            // xquery/XQueryParser.g:408:11: (k+= PRESERVE | k+= NO_PRESERVE )
             var alt14=2;
             var LA14_0 = this.input.LA(1);
 
@@ -3122,7 +3124,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt14) {
                 case 1 :
-                    // xquery/XQueryParser.g:406:12: k+= PRESERVE
+                    // xquery/XQueryParser.g:408:12: k+= PRESERVE
                     k=this.match(this.input,PRESERVE,XQueryParser.FOLLOW_PRESERVE_in_p_PreserveMode1865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3135,7 +3137,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:406:26: k+= NO_PRESERVE
+                    // xquery/XQueryParser.g:408:26: k+= NO_PRESERVE
                     k=this.match(this.input,NO_PRESERVE,XQueryParser.FOLLOW_NO_PRESERVE_in_p_PreserveMode1871); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3189,7 +3191,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:410:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
+    // xquery/XQueryParser.g:412:1: p_InheritMode : (k+= INHERIT | k+= NO_INHERIT ) ;
     // $ANTLR start "p_InheritMode"
     p_InheritMode: function() {
         var retval = new XQueryParser.p_InheritMode_return();
@@ -3203,11 +3205,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:411:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:9: ( (k+= INHERIT | k+= NO_INHERIT ) )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:411:11: (k+= INHERIT | k+= NO_INHERIT )
+            // xquery/XQueryParser.g:413:11: (k+= INHERIT | k+= NO_INHERIT )
             var alt15=2;
             var LA15_0 = this.input.LA(1);
 
@@ -3226,7 +3228,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt15) {
                 case 1 :
-                    // xquery/XQueryParser.g:411:12: k+= INHERIT
+                    // xquery/XQueryParser.g:413:12: k+= INHERIT
                     k=this.match(this.input,INHERIT,XQueryParser.FOLLOW_INHERIT_in_p_InheritMode1903); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3239,7 +3241,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:411:25: k+= NO_INHERIT
+                    // xquery/XQueryParser.g:413:25: k+= NO_INHERIT
                     k=this.match(this.input,NO_INHERIT,XQueryParser.FOLLOW_NO_INHERIT_in_p_InheritMode1909); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3293,7 +3295,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:415:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
+    // xquery/XQueryParser.g:417:1: pm_DecimalFormatDecl : k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON ;
     // $ANTLR start "pm_DecimalFormatDecl"
     pm_DecimalFormatDecl: function() {
         var retval = new XQueryParser.pm_DecimalFormatDecl_return();
@@ -3313,8 +3315,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON38_tree=null;
 
         try {
-            // xquery/XQueryParser.g:416:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
-            // xquery/XQueryParser.g:416:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
+            // xquery/XQueryParser.g:418:9: (k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON )
+            // xquery/XQueryParser.g:418:11: k= DECLARE ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) ) ( p_DFPropertyName EQUAL p_StringLiteral )* SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DecimalFormatDecl1948); if (this.state.failed) return retval;
@@ -3325,7 +3327,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:416:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
+            // xquery/XQueryParser.g:418:36: ( (k= DECIMAL_FORMAT p_QName ) | (k= DEFAULT k= DECIMAL_FORMAT ) )
             var alt16=2;
             var LA16_0 = this.input.LA(1);
 
@@ -3344,9 +3346,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt16) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:37: (k= DECIMAL_FORMAT p_QName )
-                    // xquery/XQueryParser.g:416:38: k= DECIMAL_FORMAT p_QName
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:37: (k= DECIMAL_FORMAT p_QName )
+                    // xquery/XQueryParser.g:418:38: k= DECIMAL_FORMAT p_QName
                     k=this.match(this.input,DECIMAL_FORMAT,XQueryParser.FOLLOW_DECIMAL_FORMAT_in_pm_DecimalFormatDecl1956); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3368,9 +3370,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:81: (k= DEFAULT k= DECIMAL_FORMAT )
-                    // xquery/XQueryParser.g:416:82: k= DEFAULT k= DECIMAL_FORMAT
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:81: (k= DEFAULT k= DECIMAL_FORMAT )
+                    // xquery/XQueryParser.g:418:82: k= DEFAULT k= DECIMAL_FORMAT
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_pm_DecimalFormatDecl1968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3396,7 +3398,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:416:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
+            // xquery/XQueryParser.g:418:141: ( p_DFPropertyName EQUAL p_StringLiteral )*
             loop17:
             do {
                 var alt17=2;
@@ -3409,7 +3411,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt17) {
                 case 1 :
-                    // xquery/XQueryParser.g:416:142: p_DFPropertyName EQUAL p_StringLiteral
+                    // xquery/XQueryParser.g:418:142: p_DFPropertyName EQUAL p_StringLiteral
                     this.pushFollow(XQueryParser.FOLLOW_p_DFPropertyName_in_pm_DecimalFormatDecl1981);
                     p_DFPropertyName35=this.p_DFPropertyName();
 
@@ -3477,7 +3479,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:420:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
+    // xquery/XQueryParser.g:422:1: p_DFPropertyName : (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) ;
     // $ANTLR start "p_DFPropertyName"
     p_DFPropertyName: function() {
         var retval = new XQueryParser.p_DFPropertyName_return();
@@ -3490,11 +3492,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:421:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:9: ( (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR ) )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:421:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
+            // xquery/XQueryParser.g:423:11: (k= DECIMAL_SEPARATOR | k= GROUPING_SEPARATOR | k= INFINITY | k= MINUS_SIGN | k= NAN | k= PERCENT | k= PER_MILLE | k= ZERO_DIGIT | k= DIGIT | k= PATTERN_SEPARATOR )
             var alt18=10;
             switch ( this.input.LA(1) ) {
             case DECIMAL_SEPARATOR:
@@ -3537,7 +3539,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt18) {
                 case 1 :
-                    // xquery/XQueryParser.g:421:12: k= DECIMAL_SEPARATOR
+                    // xquery/XQueryParser.g:423:12: k= DECIMAL_SEPARATOR
                     k=this.match(this.input,DECIMAL_SEPARATOR,XQueryParser.FOLLOW_DECIMAL_SEPARATOR_in_p_DFPropertyName2018); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3547,7 +3549,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:421:34: k= GROUPING_SEPARATOR
+                    // xquery/XQueryParser.g:423:34: k= GROUPING_SEPARATOR
                     k=this.match(this.input,GROUPING_SEPARATOR,XQueryParser.FOLLOW_GROUPING_SEPARATOR_in_p_DFPropertyName2024); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3557,7 +3559,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:421:57: k= INFINITY
+                    // xquery/XQueryParser.g:423:57: k= INFINITY
                     k=this.match(this.input,INFINITY,XQueryParser.FOLLOW_INFINITY_in_p_DFPropertyName2030); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3567,7 +3569,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:421:70: k= MINUS_SIGN
+                    // xquery/XQueryParser.g:423:70: k= MINUS_SIGN
                     k=this.match(this.input,MINUS_SIGN,XQueryParser.FOLLOW_MINUS_SIGN_in_p_DFPropertyName2036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3577,7 +3579,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:421:85: k= NAN
+                    // xquery/XQueryParser.g:423:85: k= NAN
                     k=this.match(this.input,NAN,XQueryParser.FOLLOW_NAN_in_p_DFPropertyName2042); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3587,7 +3589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:421:93: k= PERCENT
+                    // xquery/XQueryParser.g:423:93: k= PERCENT
                     k=this.match(this.input,PERCENT,XQueryParser.FOLLOW_PERCENT_in_p_DFPropertyName2048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3597,7 +3599,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:421:105: k= PER_MILLE
+                    // xquery/XQueryParser.g:423:105: k= PER_MILLE
                     k=this.match(this.input,PER_MILLE,XQueryParser.FOLLOW_PER_MILLE_in_p_DFPropertyName2054); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3607,7 +3609,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:421:119: k= ZERO_DIGIT
+                    // xquery/XQueryParser.g:423:119: k= ZERO_DIGIT
                     k=this.match(this.input,ZERO_DIGIT,XQueryParser.FOLLOW_ZERO_DIGIT_in_p_DFPropertyName2060); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3617,7 +3619,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:421:134: k= DIGIT
+                    // xquery/XQueryParser.g:423:134: k= DIGIT
                     k=this.match(this.input,DIGIT,XQueryParser.FOLLOW_DIGIT_in_p_DFPropertyName2066); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3627,7 +3629,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:421:144: k= PATTERN_SEPARATOR
+                    // xquery/XQueryParser.g:423:144: k= PATTERN_SEPARATOR
                     k=this.match(this.input,PATTERN_SEPARATOR,XQueryParser.FOLLOW_PATTERN_SEPARATOR_in_p_DFPropertyName2072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -3678,7 +3680,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:425:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
+    // xquery/XQueryParser.g:427:1: p_Import : ( pm_SchemaImport | pm_ModuleImport );
     // $ANTLR start "p_Import"
     p_Import: function() {
         var retval = new XQueryParser.p_Import_return();
@@ -3691,7 +3693,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:426:9: ( pm_SchemaImport | pm_ModuleImport )
+            // xquery/XQueryParser.g:428:9: ( pm_SchemaImport | pm_ModuleImport )
             var alt19=2;
             var LA19_0 = this.input.LA(1);
 
@@ -3721,7 +3723,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt19) {
                 case 1 :
-                    // xquery/XQueryParser.g:426:11: pm_SchemaImport
+                    // xquery/XQueryParser.g:428:11: pm_SchemaImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_SchemaImport_in_p_Import2101);
@@ -3734,7 +3736,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:426:29: pm_ModuleImport
+                    // xquery/XQueryParser.g:428:29: pm_ModuleImport
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_ModuleImport_in_p_Import2105);
@@ -3781,7 +3783,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:430:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:432:1: pm_SchemaImport : k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_SchemaImport"
     pm_SchemaImport: function() {
         var retval = new XQueryParser.pm_SchemaImport_return();
@@ -3807,8 +3809,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_SchemaPrefix=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SchemaPrefix");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:431:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:431:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:433:9: (k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:433:11: k= IMPORT k= SCHEMA (sp= p_SchemaPrefix )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_SchemaImport2141); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -3821,7 +3823,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:431:61: (sp= p_SchemaPrefix )?
+            // xquery/XQueryParser.g:433:61: (sp= p_SchemaPrefix )?
             var alt20=2;
             var LA20_0 = this.input.LA(1);
 
@@ -3830,7 +3832,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt20) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:61: sp= p_SchemaPrefix
+                    // xquery/XQueryParser.g:433:61: sp= p_SchemaPrefix
                     this.pushFollow(XQueryParser.FOLLOW_p_SchemaPrefix_in_pm_SchemaImport2153);
                     sp=this.p_SchemaPrefix();
 
@@ -3849,7 +3851,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:431:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:433:97: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt22=2;
             var LA22_0 = this.input.LA(1);
 
@@ -3858,7 +3860,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt22) {
                 case 1 :
-                    // xquery/XQueryParser.g:431:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:98: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_SchemaImport2163); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -3874,7 +3876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:431:138: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:433:138: ( COMMA ah+= p_StringLiteral )*
                     loop21:
                     do {
                         var alt21=2;
@@ -3887,7 +3889,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt21) {
                         case 1 :
-                            // xquery/XQueryParser.g:431:139: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:433:139: COMMA ah+= p_StringLiteral
                             COMMA41=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_SchemaImport2172); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA41);
 
@@ -3933,19 +3935,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 432:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+            // 434:17: -> ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:432:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:434:20: ^( SchemaImport ^( SchemaPrefix ( $sp)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(SchemaImport, "SchemaImport"), root_1);
 
-                // xquery/XQueryParser.g:432:35: ^( SchemaPrefix ( $sp)? )
+                // xquery/XQueryParser.g:434:35: ^( SchemaPrefix ( $sp)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(SchemaPrefix, "SchemaPrefix"), root_2);
 
-                // xquery/XQueryParser.g:432:50: ( $sp)?
+                // xquery/XQueryParser.g:434:50: ( $sp)?
                 if ( stream_sp.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_sp.nextTree());
 
@@ -3955,12 +3957,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:432:60: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:434:60: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:432:70: ( $ah)*
+                // xquery/XQueryParser.g:434:70: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -4011,7 +4013,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:436:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
+    // xquery/XQueryParser.g:438:1: p_SchemaPrefix : (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace );
     // $ANTLR start "p_SchemaPrefix"
     p_SchemaPrefix: function() {
         var retval = new XQueryParser.p_SchemaPrefix_return();
@@ -4031,7 +4033,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_DEFAULT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token DEFAULT");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:437:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
+            // xquery/XQueryParser.g:439:9: (k= NAMESPACE nn= p_NCName EQUAL -> ^( NamespaceName $nn) | k= DEFAULT k= ELEMENT k= NAMESPACE -> DefaultElementNamespace )
             var alt23=2;
             var LA23_0 = this.input.LA(1);
 
@@ -4050,7 +4052,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt23) {
                 case 1 :
-                    // xquery/XQueryParser.g:437:11: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:439:11: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_SchemaPrefix2252); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -4080,9 +4082,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_nn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nn",nn!=null?nn.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 438:17: -> ^( NamespaceName $nn)
+                    // 440:17: -> ^( NamespaceName $nn)
                     {
-                        // xquery/XQueryParser.g:438:20: ^( NamespaceName $nn)
+                        // xquery/XQueryParser.g:440:20: ^( NamespaceName $nn)
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_1);
@@ -4098,7 +4100,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:439:11: k= DEFAULT k= ELEMENT k= NAMESPACE
+                    // xquery/XQueryParser.g:441:11: k= DEFAULT k= ELEMENT k= NAMESPACE
                     k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SchemaPrefix2299); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_DEFAULT.add(k);
 
@@ -4130,7 +4132,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 440:17: -> DefaultElementNamespace
+                    // 442:17: -> DefaultElementNamespace
                     {
                         this.adaptor.addChild(root_0, this.adaptor.create(DefaultElementNamespace, "DefaultElementNamespace"));
 
@@ -4174,7 +4176,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:444:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
+    // xquery/XQueryParser.g:446:1: pm_ModuleImport : k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) ;
     // $ANTLR start "pm_ModuleImport"
     pm_ModuleImport: function() {
         var retval = new XQueryParser.pm_ModuleImport_return();
@@ -4204,8 +4206,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:445:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
-            // xquery/XQueryParser.g:445:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
+            // xquery/XQueryParser.g:447:9: (k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) ) )
+            // xquery/XQueryParser.g:447:11: k= IMPORT k= MODULE (k= NAMESPACE nn= p_NCName EQUAL )? us= p_StringLiteral (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )? SEMICOLON
             k=this.match(this.input,IMPORT,XQueryParser.FOLLOW_IMPORT_in_pm_ModuleImport2361); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_IMPORT.add(k);
 
@@ -4218,7 +4220,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:445:59: (k= NAMESPACE nn= p_NCName EQUAL )?
+            // xquery/XQueryParser.g:447:59: (k= NAMESPACE nn= p_NCName EQUAL )?
             var alt24=2;
             var LA24_0 = this.input.LA(1);
 
@@ -4227,7 +4229,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt24) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:60: k= NAMESPACE nn= p_NCName EQUAL
+                    // xquery/XQueryParser.g:447:60: k= NAMESPACE nn= p_NCName EQUAL
                     k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_pm_ModuleImport2374); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_NAMESPACE.add(k);
 
@@ -4255,7 +4257,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_StringLiteral.add(us.getTree());
-            // xquery/XQueryParser.g:445:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
+            // xquery/XQueryParser.g:447:126: (k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )* )?
             var alt26=2;
             var LA26_0 = this.input.LA(1);
 
@@ -4264,7 +4266,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt26) {
                 case 1 :
-                    // xquery/XQueryParser.g:445:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:127: k= AT ah+= p_StringLiteral ( COMMA ah+= p_StringLiteral )*
                     k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_pm_ModuleImport2393); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AT.add(k);
 
@@ -4280,7 +4282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_ah)) list_ah = [];
                     list_ah.push(ah.getTree());
 
-                    // xquery/XQueryParser.g:445:167: ( COMMA ah+= p_StringLiteral )*
+                    // xquery/XQueryParser.g:447:167: ( COMMA ah+= p_StringLiteral )*
                     loop25:
                     do {
                         var alt25=2;
@@ -4293,7 +4295,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt25) {
                         case 1 :
-                            // xquery/XQueryParser.g:445:168: COMMA ah+= p_StringLiteral
+                            // xquery/XQueryParser.g:447:168: COMMA ah+= p_StringLiteral
                             COMMA45=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_pm_ModuleImport2402); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA45);
 
@@ -4339,19 +4341,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
             var stream_ah=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token ah",list_ah);
             root_0 = this.adaptor.nil();
-            // 446:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+            // 448:17: -> ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
             {
-                // xquery/XQueryParser.g:446:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
+                // xquery/XQueryParser.g:448:20: ^( ModuleImport ^( NamespaceName ( $nn)? ) $us ^( AtHints ( $ah)* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(ModuleImport, "ModuleImport"), root_1);
 
-                // xquery/XQueryParser.g:446:35: ^( NamespaceName ( $nn)? )
+                // xquery/XQueryParser.g:448:35: ^( NamespaceName ( $nn)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceName, "NamespaceName"), root_2);
 
-                // xquery/XQueryParser.g:446:51: ( $nn)?
+                // xquery/XQueryParser.g:448:51: ( $nn)?
                 if ( stream_nn.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_nn.nextTree());
 
@@ -4361,12 +4363,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 this.adaptor.addChild(root_1, root_2);
                 }
                 this.adaptor.addChild(root_1, stream_us.nextTree());
-                // xquery/XQueryParser.g:446:61: ^( AtHints ( $ah)* )
+                // xquery/XQueryParser.g:448:61: ^( AtHints ( $ah)* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(AtHints, "AtHints"), root_2);
 
-                // xquery/XQueryParser.g:446:71: ( $ah)*
+                // xquery/XQueryParser.g:448:71: ( $ah)*
                 while ( stream_ah.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_ah.nextTree());
 
@@ -4417,7 +4419,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:450:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
+    // xquery/XQueryParser.g:452:1: pm_NamespaceDecl : k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) ;
     // $ANTLR start "pm_NamespaceDecl"
     pm_NamespaceDecl: function() {
         var retval = new XQueryParser.pm_NamespaceDecl_return();
@@ -4441,8 +4443,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         var stream_p_StringLiteral=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_StringLiteral");
         try {
-            // xquery/XQueryParser.g:451:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
-            // xquery/XQueryParser.g:451:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:453:9: (k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON -> ^( NamespaceDecl $nn $us) )
+            // xquery/XQueryParser.g:453:11: k= DECLARE k= NAMESPACE nn= p_NCName EQUAL us= p_StringLiteral SEMICOLON
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_NamespaceDecl2481); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DECLARE.add(k);
 
@@ -4488,9 +4490,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_us=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token us",us!=null?us.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 452:17: -> ^( NamespaceDecl $nn $us)
+            // 454:17: -> ^( NamespaceDecl $nn $us)
             {
-                // xquery/XQueryParser.g:452:20: ^( NamespaceDecl $nn $us)
+                // xquery/XQueryParser.g:454:20: ^( NamespaceDecl $nn $us)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(NamespaceDecl, "NamespaceDecl"), root_1);
@@ -4539,7 +4541,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:456:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:458:1: pm_DefaultNamespaceDecl : k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_DefaultNamespaceDecl"
     pm_DefaultNamespaceDecl: function() {
         var retval = new XQueryParser.pm_DefaultNamespaceDecl_return();
@@ -4555,8 +4557,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON50_tree=null;
 
         try {
-            // xquery/XQueryParser.g:457:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:457:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:459:9: (k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:459:11: k= DECLARE k= DEFAULT (k= ELEMENT | k= FUNCTION ) k= NAMESPACE p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_DefaultNamespaceDecl2558); if (this.state.failed) return retval;
@@ -4575,7 +4577,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:457:61: (k= ELEMENT | k= FUNCTION )
+            // xquery/XQueryParser.g:459:61: (k= ELEMENT | k= FUNCTION )
             var alt27=2;
             var LA27_0 = this.input.LA(1);
 
@@ -4594,7 +4596,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt27) {
                 case 1 :
-                    // xquery/XQueryParser.g:457:62: k= ELEMENT
+                    // xquery/XQueryParser.g:459:62: k= ELEMENT
                     k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_DefaultNamespaceDecl2571); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -4604,7 +4606,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:457:74: k= FUNCTION
+                    // xquery/XQueryParser.g:459:74: k= FUNCTION
                     k=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_pm_DefaultNamespaceDecl2577); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -4674,7 +4676,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:461:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
+    // xquery/XQueryParser.g:463:1: pm_AnnotatedDecl : k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON ;
     // $ANTLR start "pm_AnnotatedDecl"
     pm_AnnotatedDecl: function() {
         var retval = new XQueryParser.pm_AnnotatedDecl_return();
@@ -4691,8 +4693,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON53_tree=null;
 
         try {
-            // xquery/XQueryParser.g:462:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
-            // xquery/XQueryParser.g:462:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
+            // xquery/XQueryParser.g:464:9: (k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON )
+            // xquery/XQueryParser.g:464:11: k= DECLARE ( p_Annotation )* pg_AnnotatedDecl SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_AnnotatedDecl2618); if (this.state.failed) return retval;
@@ -4703,7 +4705,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:462:36: ( p_Annotation )*
+            // xquery/XQueryParser.g:464:36: ( p_Annotation )*
             loop28:
             do {
                 var alt28=2;
@@ -4716,7 +4718,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt28) {
                 case 1 :
-                    // xquery/XQueryParser.g:462:36: p_Annotation
+                    // xquery/XQueryParser.g:464:36: p_Annotation
                     this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_pm_AnnotatedDecl2622);
                     p_Annotation51=this.p_Annotation();
 
@@ -4779,7 +4781,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:464:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
+    // xquery/XQueryParser.g:466:1: pg_AnnotatedDecl : ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl );
     // $ANTLR start "pg_AnnotatedDecl"
     pg_AnnotatedDecl: function() {
         var retval = new XQueryParser.pg_AnnotatedDecl_return();
@@ -4795,7 +4797,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:465:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
+            // xquery/XQueryParser.g:467:9: ( p_VarDecl | pm_FunctionDecl | {...}? => p_CollectionDecl | {...}? => p_IndexDecl | {...}? => p_ICDecl )
             var alt29=5;
             var LA29_0 = this.input.LA(1);
 
@@ -4826,7 +4828,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt29) {
                 case 1 :
-                    // xquery/XQueryParser.g:465:11: p_VarDecl
+                    // xquery/XQueryParser.g:467:11: p_VarDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_VarDecl_in_pg_AnnotatedDecl2651);
@@ -4839,7 +4841,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:466:11: pm_FunctionDecl
+                    // xquery/XQueryParser.g:468:11: pm_FunctionDecl
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_pm_FunctionDecl_in_pg_AnnotatedDecl2663);
@@ -4852,7 +4854,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:467:11: {...}? => p_CollectionDecl
+                    // xquery/XQueryParser.g:469:11: {...}? => p_CollectionDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -4869,7 +4871,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:468:11: {...}? => p_IndexDecl
+                    // xquery/XQueryParser.g:470:11: {...}? => p_IndexDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -4886,7 +4888,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:469:11: {...}? => p_ICDecl
+                    // xquery/XQueryParser.g:471:11: {...}? => p_ICDecl
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(ZORBA))) ) {
@@ -4937,7 +4939,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:473:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
+    // xquery/XQueryParser.g:475:1: p_Annotation : ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? ;
     // $ANTLR start "p_Annotation"
     p_Annotation: function() {
         var retval = new XQueryParser.p_Annotation_return();
@@ -4959,8 +4961,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var RPAREN65_tree=null;
 
         try {
-            // xquery/XQueryParser.g:474:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
-            // xquery/XQueryParser.g:474:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:9: ( ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )? )
+            // xquery/XQueryParser.g:476:11: ANN_PERCENT p_QName ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             root_0 = this.adaptor.nil();
 
             ANN_PERCENT59=this.match(this.input,ANN_PERCENT,XQueryParser.FOLLOW_ANN_PERCENT_in_p_Annotation2734); if (this.state.failed) return retval;
@@ -4974,7 +4976,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName60.getTree());
-            // xquery/XQueryParser.g:474:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
+            // xquery/XQueryParser.g:476:31: ( LPAREN p_Literal ( COMMA p_Literal )* RPAREN )?
             var alt31=2;
             var LA31_0 = this.input.LA(1);
 
@@ -4983,7 +4985,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt31) {
                 case 1 :
-                    // xquery/XQueryParser.g:474:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
+                    // xquery/XQueryParser.g:476:32: LPAREN p_Literal ( COMMA p_Literal )* RPAREN
                     LPAREN61=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_Annotation2739); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     LPAREN61_tree = this.adaptor.create(LPAREN61);
@@ -4995,7 +4997,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal62.getTree());
-                    // xquery/XQueryParser.g:474:49: ( COMMA p_Literal )*
+                    // xquery/XQueryParser.g:476:49: ( COMMA p_Literal )*
                     loop30:
                     do {
                         var alt30=2;
@@ -5008,7 +5010,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt30) {
                         case 1 :
-                            // xquery/XQueryParser.g:474:50: COMMA p_Literal
+                            // xquery/XQueryParser.g:476:50: COMMA p_Literal
                             COMMA63=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Annotation2744); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             COMMA63_tree = this.adaptor.create(COMMA63);
@@ -5076,7 +5078,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:478:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
+    // xquery/XQueryParser.g:480:1: p_VarDecl : k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) ;
     // $ANTLR start "p_VarDecl"
     p_VarDecl: function() {
         var retval = new XQueryParser.p_VarDecl_return();
@@ -5106,8 +5108,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_VarDefaultValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarDefaultValue");
         var stream_p_VarValue=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_VarValue");
         try {
-            // xquery/XQueryParser.g:479:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
-            // xquery/XQueryParser.g:479:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:9: (k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) ) -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) ) )
+            // xquery/XQueryParser.g:481:11: k= VARIABLE d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDecl2780); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_VARIABLE.add(k);
 
@@ -5126,7 +5128,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:479:86: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:481:86: (td= p_TypeDeclaration )?
             var alt32=2;
             var LA32_0 = this.input.LA(1);
 
@@ -5135,7 +5137,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt32) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:86: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:481:86: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDecl2796);
                     td=this.p_TypeDeclaration();
 
@@ -5148,7 +5150,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:479:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:481:106: ( ( BIND vv= p_VarValue ) | (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? ) )
             var alt34=2;
             var LA34_0 = this.input.LA(1);
 
@@ -5167,9 +5169,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt34) {
                 case 1 :
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:107: ( BIND vv= p_VarValue )
-                    // xquery/XQueryParser.g:479:108: BIND vv= p_VarValue
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:107: ( BIND vv= p_VarValue )
+                    // xquery/XQueryParser.g:481:108: BIND vv= p_VarValue
                     BIND66=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2801); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_BIND.add(BIND66);
 
@@ -5186,16 +5188,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:479:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:130: (k= EXTERNAL ( BIND vdv= p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:481:131: k= EXTERNAL ( BIND vdv= p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_p_VarDecl2813); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:479:157: ( BIND vdv= p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:481:157: ( BIND vdv= p_VarDefaultValue )?
                     var alt33=2;
                     var LA33_0 = this.input.LA(1);
 
@@ -5204,7 +5206,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt33) {
                         case 1 :
-                            // xquery/XQueryParser.g:479:158: BIND vdv= p_VarDefaultValue
+                            // xquery/XQueryParser.g:481:158: BIND vdv= p_VarDefaultValue
                             BIND67=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDecl2818); if (this.state.failed) return retval; 
                             if ( this.state.backtracking===0 ) stream_BIND.add(BIND67);
 
@@ -5232,7 +5234,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: vv, vdv, qn, td
+            // elements: td, vv, vdv, qn
             // token labels: 
             // rule labels: qn, vv, retval, vdv, td
             // token list labels: 
@@ -5246,20 +5248,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 480:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+            // 482:17: -> ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
             {
-                // xquery/XQueryParser.g:480:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
+                // xquery/XQueryParser.g:482:20: ^( VarDecl $qn ^( VarType ( $td)? ) ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(VarDecl, "VarDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:480:34: ^( VarType ( $td)? )
+                // xquery/XQueryParser.g:482:34: ^( VarType ( $td)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarType, "VarType"), root_2);
 
-                // xquery/XQueryParser.g:480:44: ( $td)?
+                // xquery/XQueryParser.g:482:44: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_td.nextTree());
 
@@ -5268,23 +5270,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:480:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
+                // xquery/XQueryParser.g:482:50: ^( VarValue ( $vv)? ^( VarDefaultValue ( $vdv)? ) )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(VarValue, "VarValue"), root_2);
 
-                // xquery/XQueryParser.g:480:61: ( $vv)?
+                // xquery/XQueryParser.g:482:61: ( $vv)?
                 if ( stream_vv.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_vv.nextTree());
 
                 }
                 stream_vv.reset();
-                // xquery/XQueryParser.g:480:66: ^( VarDefaultValue ( $vdv)? )
+                // xquery/XQueryParser.g:482:66: ^( VarDefaultValue ( $vdv)? )
                 {
                 var root_3 = this.adaptor.nil();
                 root_3 = this.adaptor.becomeRoot(this.adaptor.create(VarDefaultValue, "VarDefaultValue"), root_3);
 
-                // xquery/XQueryParser.g:480:84: ( $vdv)?
+                // xquery/XQueryParser.g:482:84: ( $vdv)?
                 if ( stream_vdv.hasNext() ) {
                     this.adaptor.addChild(root_3, stream_vdv.nextTree());
 
@@ -5338,7 +5340,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:484:1: p_VarValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:486:1: p_VarValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarValue"
     p_VarValue: function() {
         var retval = new XQueryParser.p_VarValue_return();
@@ -5350,8 +5352,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:485:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:485:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:487:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:487:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarValue2901);
@@ -5396,7 +5398,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:489:1: p_VarDefaultValue : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:491:1: p_VarDefaultValue : p_ExprSingle[true] ;
     // $ANTLR start "p_VarDefaultValue"
     p_VarDefaultValue: function() {
         var retval = new XQueryParser.p_VarDefaultValue_return();
@@ -5408,8 +5410,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:490:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:490:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:492:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:492:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDefaultValue2928);
@@ -5454,7 +5456,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:494:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
+    // xquery/XQueryParser.g:496:1: pm_ContextItemDecl : k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON ;
     // $ANTLR start "pm_ContextItemDecl"
     pm_ContextItemDecl: function() {
         var retval = new XQueryParser.pm_ContextItemDecl_return();
@@ -5476,8 +5478,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON75_tree=null;
 
         try {
-            // xquery/XQueryParser.g:495:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
-            // xquery/XQueryParser.g:495:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
+            // xquery/XQueryParser.g:497:9: (k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON )
+            // xquery/XQueryParser.g:497:11: k= DECLARE k= CONTEXT k= ITEM (k= AS p_ItemType )? ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) ) SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_ContextItemDecl2957); if (this.state.failed) return retval;
@@ -5504,7 +5506,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:495:83: (k= AS p_ItemType )?
+            // xquery/XQueryParser.g:497:83: (k= AS p_ItemType )?
             var alt35=2;
             var LA35_0 = this.input.LA(1);
 
@@ -5513,7 +5515,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt35) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:84: k= AS p_ItemType
+                    // xquery/XQueryParser.g:497:84: k= AS p_ItemType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_ContextItemDecl2976); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -5534,7 +5536,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:495:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
+            // xquery/XQueryParser.g:497:117: ( ( BIND p_VarValue ) | (k= EXTERNAL ( BIND p_VarDefaultValue )? ) )
             var alt37=2;
             var LA37_0 = this.input.LA(1);
 
@@ -5553,9 +5555,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt37) {
                 case 1 :
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:118: ( BIND p_VarValue )
-                    // xquery/XQueryParser.g:495:119: BIND p_VarValue
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:118: ( BIND p_VarValue )
+                    // xquery/XQueryParser.g:497:119: BIND p_VarValue
                     BIND71=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl2986); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     BIND71_tree = this.adaptor.create(BIND71);
@@ -5574,9 +5576,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
-                    // xquery/XQueryParser.g:495:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:138: (k= EXTERNAL ( BIND p_VarDefaultValue )? )
+                    // xquery/XQueryParser.g:497:139: k= EXTERNAL ( BIND p_VarDefaultValue )?
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_ContextItemDecl2996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
@@ -5585,7 +5587,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    // xquery/XQueryParser.g:495:165: ( BIND p_VarDefaultValue )?
+                    // xquery/XQueryParser.g:497:165: ( BIND p_VarDefaultValue )?
                     var alt36=2;
                     var LA36_0 = this.input.LA(1);
 
@@ -5594,7 +5596,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt36) {
                         case 1 :
-                            // xquery/XQueryParser.g:495:166: BIND p_VarDefaultValue
+                            // xquery/XQueryParser.g:497:166: BIND p_VarDefaultValue
                             BIND73=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_pm_ContextItemDecl3001); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             BIND73_tree = this.adaptor.create(BIND73);
@@ -5662,7 +5664,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:500:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
+    // xquery/XQueryParser.g:502:1: pm_FunctionDecl : ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) ;
     // $ANTLR start "pm_FunctionDecl"
     pm_FunctionDecl: function() {
         var retval = new XQueryParser.pm_FunctionDecl_return();
@@ -5698,9 +5700,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pg_FQName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_FQName");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:501:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
-            // xquery/XQueryParser.g:501:11: ({...}? =>k= UPDATING )?
+            // xquery/XQueryParser.g:503:9: ( ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL ) -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? ) )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )? k= FUNCTION qn= pg_FQName LPAREN (pl= p_ParamList )? RPAREN (k= AS st= p_SequenceType )? ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:11: ({...}? =>k= UPDATING )?
             var alt38=2;
             var LA38_0 = this.input.LA(1);
 
@@ -5709,7 +5711,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt38) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:12: {...}? =>k= UPDATING
+                    // xquery/XQueryParser.g:503:12: {...}? =>k= UPDATING
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "pm_FunctionDecl", "this.lc(XQU)");
@@ -5741,7 +5743,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             LPAREN76=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_pm_FunctionDecl3058); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN76);
 
-            // xquery/XQueryParser.g:501:106: (pl= p_ParamList )?
+            // xquery/XQueryParser.g:503:106: (pl= p_ParamList )?
             var alt39=2;
             var LA39_0 = this.input.LA(1);
 
@@ -5750,7 +5752,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt39) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:106: pl= p_ParamList
+                    // xquery/XQueryParser.g:503:106: pl= p_ParamList
                     this.pushFollow(XQueryParser.FOLLOW_p_ParamList_in_pm_FunctionDecl3062);
                     pl=this.p_ParamList();
 
@@ -5766,7 +5768,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             RPAREN77=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_pm_FunctionDecl3065); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN77);
 
-            // xquery/XQueryParser.g:501:127: (k= AS st= p_SequenceType )?
+            // xquery/XQueryParser.g:503:127: (k= AS st= p_SequenceType )?
             var alt40=2;
             var LA40_0 = this.input.LA(1);
 
@@ -5775,7 +5777,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt40) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:128: k= AS st= p_SequenceType
+                    // xquery/XQueryParser.g:503:128: k= AS st= p_SequenceType
                     k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_pm_FunctionDecl3070); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_AS.add(k);
 
@@ -5794,7 +5796,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:501:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
+            // xquery/XQueryParser.g:503:168: ( LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET | k= EXTERNAL )
             var alt41=2;
             var LA41_0 = this.input.LA(1);
 
@@ -5813,7 +5815,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt41) {
                 case 1 :
-                    // xquery/XQueryParser.g:501:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
+                    // xquery/XQueryParser.g:503:169: LBRACKET soe= p_StatementsAndOptionalExpr RBRACKET
                     LBRACKET78=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_FunctionDecl3081); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET78);
 
@@ -5830,7 +5832,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:501:221: k= EXTERNAL
+                    // xquery/XQueryParser.g:503:221: k= EXTERNAL
                     k=this.match(this.input,EXTERNAL,XQueryParser.FOLLOW_EXTERNAL_in_pm_FunctionDecl3093); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EXTERNAL.add(k);
 
@@ -5846,34 +5848,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: st, pl, qn, soe
+            // elements: pl, soe, qn, st
             // token labels: 
-            // rule labels: soe, qn, retval, pl, st
+            // rule labels: qn, soe, retval, pl, st
             // token list labels: 
             // rule list labels: 
             if ( this.state.backtracking===0 ) {
             retval.tree = root_0;
-            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_qn=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token qn",qn!=null?qn.tree:null);
+            var stream_soe=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token soe",soe!=null?soe.tree:null);
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_pl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token pl",pl!=null?pl.tree:null);
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 502:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+            // 504:17: -> ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
             {
-                // xquery/XQueryParser.g:502:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
+                // xquery/XQueryParser.g:504:20: ^( FunctionDecl $qn ^( ParamList ( $pl)? ) ^( ReturnType ( $st)? ) ( $soe)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(FunctionDecl, "FunctionDecl"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:502:39: ^( ParamList ( $pl)? )
+                // xquery/XQueryParser.g:504:39: ^( ParamList ( $pl)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ParamList, "ParamList"), root_2);
 
-                // xquery/XQueryParser.g:502:51: ( $pl)?
+                // xquery/XQueryParser.g:504:51: ( $pl)?
                 if ( stream_pl.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pl.nextTree());
 
@@ -5882,12 +5884,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:57: ^( ReturnType ( $st)? )
+                // xquery/XQueryParser.g:504:57: ^( ReturnType ( $st)? )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(ReturnType, "ReturnType"), root_2);
 
-                // xquery/XQueryParser.g:502:70: ( $st)?
+                // xquery/XQueryParser.g:504:70: ( $st)?
                 if ( stream_st.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_st.nextTree());
 
@@ -5896,7 +5898,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:502:76: ( $soe)?
+                // xquery/XQueryParser.g:504:76: ( $soe)?
                 if ( stream_soe.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_soe.nextTree());
 
@@ -5944,7 +5946,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:506:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
+    // xquery/XQueryParser.g:508:1: p_ParamList : p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ ;
     // $ANTLR start "p_ParamList"
     p_ParamList: function() {
         var retval = new XQueryParser.p_ParamList_return();
@@ -5959,8 +5961,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_COMMA=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COMMA");
         var stream_p_Param=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Param");
         try {
-            // xquery/XQueryParser.g:507:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
-            // xquery/XQueryParser.g:507:11: p+= p_Param ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:9: (p+= p_Param ( COMMA p+= p_Param )* -> ( $p)+ )
+            // xquery/XQueryParser.g:509:11: p+= p_Param ( COMMA p+= p_Param )*
             this.pushFollow(XQueryParser.FOLLOW_p_Param_in_p_ParamList3170);
             p=this.p_Param();
 
@@ -5970,7 +5972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_p)) list_p = [];
             list_p.push(p.getTree());
 
-            // xquery/XQueryParser.g:507:22: ( COMMA p+= p_Param )*
+            // xquery/XQueryParser.g:509:22: ( COMMA p+= p_Param )*
             loop42:
             do {
                 var alt42=2;
@@ -5983,7 +5985,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt42) {
                 case 1 :
-                    // xquery/XQueryParser.g:507:23: COMMA p+= p_Param
+                    // xquery/XQueryParser.g:509:23: COMMA p+= p_Param
                     COMMA80=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ParamList3173); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_COMMA.add(COMMA80);
 
@@ -6018,7 +6020,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
             var stream_p=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token p",list_p);
             root_0 = this.adaptor.nil();
-            // 508:17: -> ( $p)+
+            // 510:17: -> ( $p)+
             {
                 if ( !(stream_p.hasNext()) ) {
                     throw new org.antlr.runtime.tree.RewriteEarlyExitException();
@@ -6067,7 +6069,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:512:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
+    // xquery/XQueryParser.g:514:1: p_Param : d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) ;
     // $ANTLR start "p_Param"
     p_Param: function() {
         var retval = new XQueryParser.p_Param_return();
@@ -6084,8 +6086,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_TypeDeclaration=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_TypeDeclaration");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:513:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
-            // xquery/XQueryParser.g:513:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:9: (d= DOLLAR qn= p_QName (td= p_TypeDeclaration )? -> ^( Param $qn ( $td)? ) )
+            // xquery/XQueryParser.g:515:11: d= DOLLAR qn= p_QName (td= p_TypeDeclaration )?
             d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_Param3237); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_DOLLAR.add(d);
 
@@ -6098,7 +6100,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (qn?qn.stop:null)); 
             }
-            // xquery/XQueryParser.g:513:60: (td= p_TypeDeclaration )?
+            // xquery/XQueryParser.g:515:60: (td= p_TypeDeclaration )?
             var alt43=2;
             var LA43_0 = this.input.LA(1);
 
@@ -6107,7 +6109,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt43) {
                 case 1 :
-                    // xquery/XQueryParser.g:513:60: td= p_TypeDeclaration
+                    // xquery/XQueryParser.g:515:60: td= p_TypeDeclaration
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_Param3247);
                     td=this.p_TypeDeclaration();
 
@@ -6123,7 +6125,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: qn, td
+            // elements: td, qn
             // token labels: 
             // rule labels: qn, retval, td
             // token list labels: 
@@ -6135,15 +6137,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_td=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token td",td!=null?td.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 514:17: -> ^( Param $qn ( $td)? )
+            // 516:17: -> ^( Param $qn ( $td)? )
             {
-                // xquery/XQueryParser.g:514:20: ^( Param $qn ( $td)? )
+                // xquery/XQueryParser.g:516:20: ^( Param $qn ( $td)? )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(Param, "Param"), root_1);
 
                 this.adaptor.addChild(root_1, stream_qn.nextTree());
-                // xquery/XQueryParser.g:514:32: ( $td)?
+                // xquery/XQueryParser.g:516:32: ( $td)?
                 if ( stream_td.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_td.nextTree());
 
@@ -6191,7 +6193,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:518:1: pm_FunctionBody : p_EnclosedExpr ;
+    // xquery/XQueryParser.g:520:1: pm_FunctionBody : p_EnclosedExpr ;
     // $ANTLR start "pm_FunctionBody"
     pm_FunctionBody: function() {
         var retval = new XQueryParser.pm_FunctionBody_return();
@@ -6203,8 +6205,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:519:9: ( p_EnclosedExpr )
-            // xquery/XQueryParser.g:519:11: p_EnclosedExpr
+            // xquery/XQueryParser.g:521:9: ( p_EnclosedExpr )
+            // xquery/XQueryParser.g:521:11: p_EnclosedExpr
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_EnclosedExpr_in_pm_FunctionBody3303);
@@ -6249,7 +6251,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:524:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
+    // xquery/XQueryParser.g:526:1: p_EnclosedExpr : LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) ;
     // $ANTLR start "p_EnclosedExpr"
     p_EnclosedExpr: function() {
         var retval = new XQueryParser.p_EnclosedExpr_return();
@@ -6267,8 +6269,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_RBRACKET=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RBRACKET");
         var stream_p_Expr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_Expr");
         try {
-            // xquery/XQueryParser.g:525:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
-            // xquery/XQueryParser.g:525:11: LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:527:9: ( LBRACKET p_Expr[true,true] RBRACKET -> ^( EnclosedExpr p_Expr ) )
+            // xquery/XQueryParser.g:527:11: LBRACKET p_Expr[true,true] RBRACKET
             LBRACKET82=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_EnclosedExpr3330); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_LBRACKET.add(LBRACKET82);
 
@@ -6294,9 +6296,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 526:17: -> ^( EnclosedExpr p_Expr )
+            // 528:17: -> ^( EnclosedExpr p_Expr )
             {
-                // xquery/XQueryParser.g:526:20: ^( EnclosedExpr p_Expr )
+                // xquery/XQueryParser.g:528:20: ^( EnclosedExpr p_Expr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(EnclosedExpr, "EnclosedExpr"), root_1);
@@ -6344,7 +6346,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:530:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
+    // xquery/XQueryParser.g:532:1: pm_OptionDecl : k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON ;
     // $ANTLR start "pm_OptionDecl"
     pm_OptionDecl: function() {
         var retval = new XQueryParser.pm_OptionDecl_return();
@@ -6361,8 +6363,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var SEMICOLON87_tree=null;
 
         try {
-            // xquery/XQueryParser.g:531:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
-            // xquery/XQueryParser.g:531:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
+            // xquery/XQueryParser.g:533:9: (k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON )
+            // xquery/XQueryParser.g:533:11: k= DECLARE k= OPTION p_QName p_StringLiteral SEMICOLON
             root_0 = this.adaptor.nil();
 
             k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_OptionDecl3387); if (this.state.failed) return retval;
@@ -6434,7 +6436,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
+    // xquery/XQueryParser.g:537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );
     // $ANTLR start "pm_QueryBody"
     pm_QueryBody: function() {
         var retval = new XQueryParser.pm_QueryBody_return();
@@ -6447,12 +6449,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:536:9: ({...}? => p_Program | p_Expr[true,true] )
+            // xquery/XQueryParser.g:538:9: ({...}? => p_Program | p_Expr[true,true] )
             var alt44=2;
             alt44 = this.dfa44.predict(this.input);
             switch (alt44) {
                 case 1 :
-                    // xquery/XQueryParser.g:536:11: {...}? => p_Program
+                    // xquery/XQueryParser.g:538:11: {...}? => p_Program
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQS))) ) {
@@ -6469,7 +6471,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:537:11: p_Expr[true,true]
+                    // xquery/XQueryParser.g:539:11: p_Expr[true,true]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_QueryBody3442);
@@ -6516,7 +6518,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:547:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
+    // xquery/XQueryParser.g:549:1: p_Expr[strict, allowConcat] : es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* ;
     // $ANTLR start "p_Expr"
     p_Expr: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Expr_return();
@@ -6531,8 +6533,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var COMMA90_tree=null;
 
         try {
-            // xquery/XQueryParser.g:548:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
-            // xquery/XQueryParser.g:548:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:550:9: (es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )* )
+            // xquery/XQueryParser.g:550:11: es= p_ExprSingle[$strict] ( COMMA p_ExprSingle[$strict] )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Expr3478);
@@ -6544,7 +6546,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (!allowConcat) throw new Exception(); 
             }
-            // xquery/XQueryParser.g:549:11: ( COMMA p_ExprSingle[$strict] )*
+            // xquery/XQueryParser.g:551:11: ( COMMA p_ExprSingle[$strict] )*
             loop45:
             do {
                 var alt45=2;
@@ -6557,7 +6559,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt45) {
                 case 1 :
-                    // xquery/XQueryParser.g:549:12: COMMA p_ExprSingle[$strict]
+                    // xquery/XQueryParser.g:551:12: COMMA p_ExprSingle[$strict]
                     COMMA90=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_Expr3494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     COMMA90_tree = this.adaptor.create(COMMA90);
@@ -6624,7 +6626,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
+    // xquery/XQueryParser.g:573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );
     // $ANTLR start "p_ExprSingle"
     p_ExprSingle: function(strict) {
         var retval = new XQueryParser.p_ExprSingle_return();
@@ -6641,12 +6643,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:572:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
+            // xquery/XQueryParser.g:574:9: ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple )
             var alt46=6;
             alt46 = this.dfa46.predict(this.input);
             switch (alt46) {
                 case 1 :
-                    // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
+                    // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_FLWORHybrid_in_p_ExprSingle3563);
@@ -6659,7 +6661,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:573:11: ( IF LPAREN )=> p_IfHybrid[$strict]
+                    // xquery/XQueryParser.g:575:11: ( IF LPAREN )=> p_IfHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_IfHybrid_in_p_ExprSingle3593);
@@ -6672,7 +6674,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
+                    // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )=> p_SwitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_SwitchHybrid_in_p_ExprSingle3619);
@@ -6685,7 +6687,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
+                    // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TypeswitchHybrid_in_p_ExprSingle3641);
@@ -6698,7 +6700,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
+                    // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )=> p_TryCatchHybrid[$strict]
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_TryCatchHybrid_in_p_ExprSingle3668);
@@ -6711,7 +6713,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:577:11: p_ExprSimple
+                    // xquery/XQueryParser.g:579:11: p_ExprSimple
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ExprSingle3681);
@@ -6758,7 +6760,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:581:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
+    // xquery/XQueryParser.g:583:1: p_FLWORHybrid[strict] : p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] ;
     // $ANTLR start "p_FLWORHybrid"
     p_FLWORHybrid: function(strict) {
         var retval = new XQueryParser.p_FLWORHybrid_return();
@@ -6772,8 +6774,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:582:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
-            // xquery/XQueryParser.g:582:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
+            // xquery/XQueryParser.g:584:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict] )
+            // xquery/XQueryParser.g:584:11: p_InitialClause ( p_IntermediateClause )* p_ReturnHybrid[$strict]
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORHybrid3708);
@@ -6782,7 +6784,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause98.getTree());
-            // xquery/XQueryParser.g:582:27: ( p_IntermediateClause )*
+            // xquery/XQueryParser.g:584:27: ( p_IntermediateClause )*
             loop47:
             do {
                 var alt47=2;
@@ -6795,7 +6797,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt47) {
                 case 1 :
-                    // xquery/XQueryParser.g:582:27: p_IntermediateClause
+                    // xquery/XQueryParser.g:584:27: p_IntermediateClause
                     this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORHybrid3710);
                     p_IntermediateClause99=this.p_IntermediateClause();
 
@@ -6853,7 +6855,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:586:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
+    // xquery/XQueryParser.g:588:1: p_InitialClause : ( p_ForClause | p_LetClause | p_WindowClause );
     // $ANTLR start "p_InitialClause"
     p_InitialClause: function() {
         var retval = new XQueryParser.p_InitialClause_return();
@@ -6867,7 +6869,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:587:9: ( p_ForClause | p_LetClause | p_WindowClause )
+            // xquery/XQueryParser.g:589:9: ( p_ForClause | p_LetClause | p_WindowClause )
             var alt48=3;
             var LA48_0 = this.input.LA(1);
 
@@ -6900,7 +6902,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt48) {
                 case 1 :
-                    // xquery/XQueryParser.g:587:11: p_ForClause
+                    // xquery/XQueryParser.g:589:11: p_ForClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_ForClause_in_p_InitialClause3740);
@@ -6913,7 +6915,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:587:25: p_LetClause
+                    // xquery/XQueryParser.g:589:25: p_LetClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_LetClause_in_p_InitialClause3744);
@@ -6926,7 +6928,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:587:39: p_WindowClause
+                    // xquery/XQueryParser.g:589:39: p_WindowClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WindowClause_in_p_InitialClause3748);
@@ -6973,7 +6975,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:591:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
+    // xquery/XQueryParser.g:593:1: p_IntermediateClause : ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause );
     // $ANTLR start "p_IntermediateClause"
     p_IntermediateClause: function() {
         var retval = new XQueryParser.p_IntermediateClause_return();
@@ -6989,7 +6991,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
         try {
-            // xquery/XQueryParser.g:592:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
+            // xquery/XQueryParser.g:594:9: ( p_InitialClause | p_WhereClause | p_GroupByClause | p_OrderByClause | p_CountClause )
             var alt49=5;
             switch ( this.input.LA(1) ) {
             case FOR:
@@ -7019,7 +7021,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt49) {
                 case 1 :
-                    // xquery/XQueryParser.g:592:11: p_InitialClause
+                    // xquery/XQueryParser.g:594:11: p_InitialClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_IntermediateClause3774);
@@ -7032,7 +7034,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:592:29: p_WhereClause
+                    // xquery/XQueryParser.g:594:29: p_WhereClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_WhereClause_in_p_IntermediateClause3778);
@@ -7045,7 +7047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:592:45: p_GroupByClause
+                    // xquery/XQueryParser.g:594:45: p_GroupByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_GroupByClause_in_p_IntermediateClause3782);
@@ -7058,7 +7060,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:592:63: p_OrderByClause
+                    // xquery/XQueryParser.g:594:63: p_OrderByClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_OrderByClause_in_p_IntermediateClause3786);
@@ -7071,7 +7073,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:592:81: p_CountClause
+                    // xquery/XQueryParser.g:594:81: p_CountClause
                     root_0 = this.adaptor.nil();
 
                     this.pushFollow(XQueryParser.FOLLOW_p_CountClause_in_p_IntermediateClause3790);
@@ -7118,7 +7120,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:596:1: p_StringConcatExpr : p_RangeExpr ( CONCAT p_RangeExpr )* ;
+    // xquery/XQueryParser.g:598:1: p_StringConcatExpr : p_RangeExpr (o= CONCAT p_RangeExpr )* ;
     // $ANTLR start "p_StringConcatExpr"
     p_StringConcatExpr: function() {
         var retval = new XQueryParser.p_StringConcatExpr_return();
@@ -7126,15 +7128,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CONCAT110 = null;
+        var o = null;
          var p_RangeExpr109 = null;
-         var p_RangeExpr111 = null;
+         var p_RangeExpr110 = null;
 
-        var CONCAT110_tree=null;
+        var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:597:4: ( p_RangeExpr ( CONCAT p_RangeExpr )* )
-            // xquery/XQueryParser.g:597:6: p_RangeExpr ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:4: ( p_RangeExpr (o= CONCAT p_RangeExpr )* )
+            // xquery/XQueryParser.g:599:6: p_RangeExpr (o= CONCAT p_RangeExpr )*
             root_0 = this.adaptor.nil();
 
             this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811);
@@ -7143,7 +7145,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr109.getTree());
-            // xquery/XQueryParser.g:597:18: ( CONCAT p_RangeExpr )*
+            // xquery/XQueryParser.g:599:18: (o= CONCAT p_RangeExpr )*
             loop50:
             do {
                 var alt50=2;
@@ -7156,18 +7158,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt50) {
                 case 1 :
-                    // xquery/XQueryParser.g:597:20: CONCAT p_RangeExpr
-                    CONCAT110=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3815); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:599:20: o= CONCAT p_RangeExpr
+                    o=this.match(this.input,CONCAT,XQueryParser.FOLLOW_CONCAT_in_p_StringConcatExpr3817); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CONCAT110_tree = this.adaptor.create(CONCAT110);
-                    this.adaptor.addChild(root_0, CONCAT110_tree);
+                    o_tree = this.adaptor.create(o);
+                    this.adaptor.addChild(root_0, o_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817);
-                    p_RangeExpr111=this.p_RangeExpr();
+                    if ( this.state.backtracking===0 ) {
+                       this.ao(o); 
+                    }
+                    this.pushFollow(XQueryParser.FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821);
+                    p_RangeExpr110=this.p_RangeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr111.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RangeExpr110.getTree());
 
 
                     break;
@@ -7213,7 +7218,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:602:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
+    // xquery/XQueryParser.g:604:1: p_ForClause : k= FOR p_ForBinding ( COMMA p_ForBinding )* ;
     // $ANTLR start "p_ForClause"
     p_ForClause: function() {
         var retval = new XQueryParser.p_ForClause_return();
@@ -7222,19 +7227,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA113 = null;
-         var p_ForBinding112 = null;
-         var p_ForBinding114 = null;
+        var COMMA112 = null;
+         var p_ForBinding111 = null;
+         var p_ForBinding113 = null;
 
         var k_tree=null;
-        var COMMA113_tree=null;
+        var COMMA112_tree=null;
 
         try {
-            // xquery/XQueryParser.g:603:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
-            // xquery/XQueryParser.g:603:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
+            // xquery/XQueryParser.g:605:9: (k= FOR p_ForBinding ( COMMA p_ForBinding )* )
+            // xquery/XQueryParser.g:605:11: k= FOR p_ForBinding ( COMMA p_ForBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3844); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_ForClause3848); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7242,13 +7247,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3848);
-            p_ForBinding112=this.p_ForBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3852);
+            p_ForBinding111=this.p_ForBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding112.getTree());
-            // xquery/XQueryParser.g:603:45: ( COMMA p_ForBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding111.getTree());
+            // xquery/XQueryParser.g:605:45: ( COMMA p_ForBinding )*
             loop51:
             do {
                 var alt51=2;
@@ -7261,18 +7266,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt51) {
                 case 1 :
-                    // xquery/XQueryParser.g:603:46: COMMA p_ForBinding
-                    COMMA113=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3851); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:605:46: COMMA p_ForBinding
+                    COMMA112=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ForClause3855); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA113_tree = this.adaptor.create(COMMA113);
-                    this.adaptor.addChild(root_0, COMMA113_tree);
+                    COMMA112_tree = this.adaptor.create(COMMA112);
+                    this.adaptor.addChild(root_0, COMMA112_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3853);
-                    p_ForBinding114=this.p_ForBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForBinding_in_p_ForClause3857);
+                    p_ForBinding113=this.p_ForBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding114.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForBinding113.getTree());
 
 
                     break;
@@ -7318,7 +7323,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:607:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:609:1: p_ForBinding : s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] ;
     // $ANTLR start "p_ForBinding"
     p_ForBinding: function() {
         var retval = new XQueryParser.p_ForBinding_return();
@@ -7329,26 +7334,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var s = null;
         var k = null;
          var v = null;
-         var p_TypeDeclaration115 = null;
-         var p_AllowingEmpty116 = null;
-         var p_PositionalVar117 = null;
-         var p_FTScoreVar118 = null;
-         var p_ExprSingle119 = null;
+         var p_TypeDeclaration114 = null;
+         var p_AllowingEmpty115 = null;
+         var p_PositionalVar116 = null;
+         var p_FTScoreVar117 = null;
+         var p_ExprSingle118 = null;
 
         var s_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:608:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:608:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
+            // xquery/XQueryParser.g:610:9: (s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:610:11: s= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( p_AllowingEmpty )? ( p_PositionalVar )? ( p_FTScoreVar )? k= IN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3883); if (this.state.failed) return retval;
+            s=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ForBinding3887); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             s_tree = this.adaptor.create(s);
             this.adaptor.addChild(root_0, s_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3887);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_ForBinding3891);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -7357,7 +7362,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(s, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:608:58: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:610:58: ( p_TypeDeclaration )?
             var alt52=2;
             var LA52_0 = this.input.LA(1);
 
@@ -7366,20 +7371,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt52) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:58: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3891);
-                    p_TypeDeclaration115=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:610:58: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_ForBinding3895);
+                    p_TypeDeclaration114=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration115.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration114.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:77: ( p_AllowingEmpty )?
+            // xquery/XQueryParser.g:610:77: ( p_AllowingEmpty )?
             var alt53=2;
             var LA53_0 = this.input.LA(1);
 
@@ -7388,20 +7393,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt53) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:77: p_AllowingEmpty
-                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3894);
-                    p_AllowingEmpty116=this.p_AllowingEmpty();
+                    // xquery/XQueryParser.g:610:77: p_AllowingEmpty
+                    this.pushFollow(XQueryParser.FOLLOW_p_AllowingEmpty_in_p_ForBinding3898);
+                    p_AllowingEmpty115=this.p_AllowingEmpty();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty116.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AllowingEmpty115.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:94: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:610:94: ( p_PositionalVar )?
             var alt54=2;
             var LA54_0 = this.input.LA(1);
 
@@ -7410,20 +7415,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt54) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:94: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3897);
-                    p_PositionalVar117=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:610:94: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_ForBinding3901);
+                    p_PositionalVar116=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar117.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar116.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:608:111: ( p_FTScoreVar )?
+            // xquery/XQueryParser.g:610:111: ( p_FTScoreVar )?
             var alt55=2;
             var LA55_0 = this.input.LA(1);
 
@@ -7432,20 +7437,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt55) {
                 case 1 :
-                    // xquery/XQueryParser.g:608:111: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3900);
-                    p_FTScoreVar118=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:610:111: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_ForBinding3904);
+                    p_FTScoreVar117=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar118.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar117.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3905); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_ForBinding3909); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7453,12 +7458,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3909);
-            p_ExprSingle119=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ForBinding3913);
+            p_ExprSingle118=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle119.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle118.getTree());
 
 
 
@@ -7495,7 +7500,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:612:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
+    // xquery/XQueryParser.g:614:1: p_AllowingEmpty : k= ALLOWING k= EMPTY ;
     // $ANTLR start "p_AllowingEmpty"
     p_AllowingEmpty: function() {
         var retval = new XQueryParser.p_AllowingEmpty_return();
@@ -7508,11 +7513,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:613:9: (k= ALLOWING k= EMPTY )
-            // xquery/XQueryParser.g:613:11: k= ALLOWING k= EMPTY
+            // xquery/XQueryParser.g:615:9: (k= ALLOWING k= EMPTY )
+            // xquery/XQueryParser.g:615:11: k= ALLOWING k= EMPTY
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3938); if (this.state.failed) return retval;
+            k=this.match(this.input,ALLOWING,XQueryParser.FOLLOW_ALLOWING_in_p_AllowingEmpty3942); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7520,7 +7525,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3944); if (this.state.failed) return retval;
+            k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_AllowingEmpty3948); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7564,7 +7569,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:617:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:619:1: p_PositionalVar : k= AT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_PositionalVar"
     p_PositionalVar: function() {
         var retval = new XQueryParser.p_PositionalVar_return();
@@ -7580,11 +7585,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:618:9: (k= AT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:618:11: k= AT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:620:9: (k= AT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:620:11: k= AT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3974); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_PositionalVar3978); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7592,12 +7597,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3980); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_PositionalVar3984); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3984);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_PositionalVar3988);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -7642,7 +7647,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:622:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
+    // xquery/XQueryParser.g:624:1: p_LetClause : k= LET p_LetBinding ( COMMA p_LetBinding )* ;
     // $ANTLR start "p_LetClause"
     p_LetClause: function() {
         var retval = new XQueryParser.p_LetClause_return();
@@ -7651,19 +7656,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA121 = null;
-         var p_LetBinding120 = null;
-         var p_LetBinding122 = null;
+        var COMMA120 = null;
+         var p_LetBinding119 = null;
+         var p_LetBinding121 = null;
 
         var k_tree=null;
-        var COMMA121_tree=null;
+        var COMMA120_tree=null;
 
         try {
-            // xquery/XQueryParser.g:623:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
-            // xquery/XQueryParser.g:623:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
+            // xquery/XQueryParser.g:625:9: (k= LET p_LetBinding ( COMMA p_LetBinding )* )
+            // xquery/XQueryParser.g:625:11: k= LET p_LetBinding ( COMMA p_LetBinding )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4014); if (this.state.failed) return retval;
+            k=this.match(this.input,LET,XQueryParser.FOLLOW_LET_in_p_LetClause4018); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7671,13 +7676,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4018);
-            p_LetBinding120=this.p_LetBinding();
+            this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4022);
+            p_LetBinding119=this.p_LetBinding();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding120.getTree());
-            // xquery/XQueryParser.g:623:45: ( COMMA p_LetBinding )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding119.getTree());
+            // xquery/XQueryParser.g:625:45: ( COMMA p_LetBinding )*
             loop56:
             do {
                 var alt56=2;
@@ -7690,18 +7695,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt56) {
                 case 1 :
-                    // xquery/XQueryParser.g:623:46: COMMA p_LetBinding
-                    COMMA121=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4021); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:625:46: COMMA p_LetBinding
+                    COMMA120=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_LetClause4025); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA121_tree = this.adaptor.create(COMMA121);
-                    this.adaptor.addChild(root_0, COMMA121_tree);
+                    COMMA120_tree = this.adaptor.create(COMMA120);
+                    this.adaptor.addChild(root_0, COMMA120_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4023);
-                    p_LetBinding122=this.p_LetBinding();
+                    this.pushFollow(XQueryParser.FOLLOW_p_LetBinding_in_p_LetClause4027);
+                    p_LetBinding121=this.p_LetBinding();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding122.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_LetBinding121.getTree());
 
 
                     break;
@@ -7747,7 +7752,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:628:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:630:1: p_LetBinding : ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] ;
     // $ANTLR start "p_LetBinding"
     p_LetBinding: function() {
         var retval = new XQueryParser.p_LetBinding_return();
@@ -7756,21 +7761,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND125 = null;
+        var BIND124 = null;
          var v = null;
-         var p_TypeDeclaration123 = null;
-         var p_FTScoreVar124 = null;
-         var p_ExprSingle126 = null;
+         var p_TypeDeclaration122 = null;
+         var p_FTScoreVar123 = null;
+         var p_ExprSingle125 = null;
 
         var d_tree=null;
-        var BIND125_tree=null;
+        var BIND124_tree=null;
 
         try {
-            // xquery/XQueryParser.g:629:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
+            // xquery/XQueryParser.g:631:9: ( ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true] )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar ) BIND p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:629:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
+            // xquery/XQueryParser.g:631:11: ( (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ) | p_FTScoreVar )
             var alt58=2;
             var LA58_0 = this.input.LA(1);
 
@@ -7789,15 +7794,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt58) {
                 case 1 :
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
-                    // xquery/XQueryParser.g:629:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4057); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:13: (d= DOLLAR v= p_VarName ( p_TypeDeclaration )? )
+                    // xquery/XQueryParser.g:631:14: d= DOLLAR v= p_VarName ( p_TypeDeclaration )?
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_LetBinding4061); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4061);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_LetBinding4065);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -7806,7 +7811,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(d, (v?v.stop:null));
                     }
-                    // xquery/XQueryParser.g:629:59: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:631:59: ( p_TypeDeclaration )?
                     var alt57=2;
                     var LA57_0 = this.input.LA(1);
 
@@ -7815,13 +7820,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt57) {
                         case 1 :
-                            // xquery/XQueryParser.g:629:59: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4065);
-                            p_TypeDeclaration123=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:631:59: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_LetBinding4069);
+                            p_TypeDeclaration122=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration123.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration122.getTree());
 
 
                             break;
@@ -7835,30 +7840,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:629:81: p_FTScoreVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4071);
-                    p_FTScoreVar124=this.p_FTScoreVar();
+                    // xquery/XQueryParser.g:631:81: p_FTScoreVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScoreVar_in_p_LetBinding4075);
+                    p_FTScoreVar123=this.p_FTScoreVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar124.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScoreVar123.getTree());
 
 
                     break;
 
             }
 
-            BIND125=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4075); if (this.state.failed) return retval;
+            BIND124=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_LetBinding4079); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND125_tree = this.adaptor.create(BIND125);
-            this.adaptor.addChild(root_0, BIND125_tree);
+            BIND124_tree = this.adaptor.create(BIND124);
+            this.adaptor.addChild(root_0, BIND124_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4077);
-            p_ExprSingle126=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_LetBinding4081);
+            p_ExprSingle125=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle126.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle125.getTree());
 
 
 
@@ -7895,7 +7900,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:633:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
+    // xquery/XQueryParser.g:635:1: p_WindowClause : k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) ;
     // $ANTLR start "p_WindowClause"
     p_WindowClause: function() {
         var retval = new XQueryParser.p_WindowClause_return();
@@ -7904,17 +7909,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TumblingWindowClause127 = null;
-         var p_SlidingWindowClause128 = null;
+         var p_TumblingWindowClause126 = null;
+         var p_SlidingWindowClause127 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:634:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
-            // xquery/XQueryParser.g:634:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:9: (k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause ) )
+            // xquery/XQueryParser.g:636:11: k= FOR ( p_TumblingWindowClause | p_SlidingWindowClause )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4106); if (this.state.failed) return retval;
+            k=this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_p_WindowClause4110); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -7922,7 +7927,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:634:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
+            // xquery/XQueryParser.g:636:32: ( p_TumblingWindowClause | p_SlidingWindowClause )
             var alt59=2;
             var LA59_0 = this.input.LA(1);
 
@@ -7941,24 +7946,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt59) {
                 case 1 :
-                    // xquery/XQueryParser.g:634:33: p_TumblingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111);
-                    p_TumblingWindowClause127=this.p_TumblingWindowClause();
+                    // xquery/XQueryParser.g:636:33: p_TumblingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115);
+                    p_TumblingWindowClause126=this.p_TumblingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause127.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TumblingWindowClause126.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:634:58: p_SlidingWindowClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115);
-                    p_SlidingWindowClause128=this.p_SlidingWindowClause();
+                    // xquery/XQueryParser.g:636:58: p_SlidingWindowClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119);
+                    p_SlidingWindowClause127=this.p_SlidingWindowClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause128.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SlidingWindowClause127.getTree());
 
 
                     break;
@@ -8001,7 +8006,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:638:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:640:1: p_TumblingWindowClause : k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_TumblingWindowClause"
     p_TumblingWindowClause: function() {
         var retval = new XQueryParser.p_TumblingWindowClause_return();
@@ -8012,20 +8017,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration129 = null;
-         var p_ExprSingle130 = null;
-         var p_WindowStartCondition131 = null;
-         var p_WindowEndCondition132 = null;
+         var p_TypeDeclaration128 = null;
+         var p_ExprSingle129 = null;
+         var p_WindowStartCondition130 = null;
+         var p_WindowEndCondition131 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:639:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:639:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:641:9: (k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:641:11: k= TUMBLING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4152); if (this.state.failed) return retval;
+            k=this.match(this.input,TUMBLING,XQueryParser.FOLLOW_TUMBLING_in_p_TumblingWindowClause4156); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8033,7 +8038,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4158); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_TumblingWindowClause4162); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8041,12 +8046,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4164); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TumblingWindowClause4168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4168);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TumblingWindowClause4172);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -8055,7 +8060,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.av(d, (v?v.stop:null));
             }
-            // xquery/XQueryParser.g:639:106: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:641:106: ( p_TypeDeclaration )?
             var alt60=2;
             var LA60_0 = this.input.LA(1);
 
@@ -8064,20 +8069,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt60) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:106: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172);
-                    p_TypeDeclaration129=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:641:106: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176);
+                    p_TypeDeclaration128=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration129.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration128.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4177); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_TumblingWindowClause4181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8085,19 +8090,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181);
-            p_ExprSingle130=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185);
+            p_ExprSingle129=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle130.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184);
-            p_WindowStartCondition131=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle129.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188);
+            p_WindowStartCondition130=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition131.getTree());
-            // xquery/XQueryParser.g:639:187: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition130.getTree());
+            // xquery/XQueryParser.g:641:187: ( p_WindowEndCondition )?
             var alt61=2;
             var LA61_0 = this.input.LA(1);
 
@@ -8106,13 +8111,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt61) {
                 case 1 :
-                    // xquery/XQueryParser.g:639:187: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186);
-                    p_WindowEndCondition132=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:641:187: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190);
+                    p_WindowEndCondition131=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition132.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition131.getTree());
 
 
                     break;
@@ -8155,7 +8160,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:643:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
+    // xquery/XQueryParser.g:645:1: p_SlidingWindowClause : k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? ;
     // $ANTLR start "p_SlidingWindowClause"
     p_SlidingWindowClause: function() {
         var retval = new XQueryParser.p_SlidingWindowClause_return();
@@ -8166,20 +8171,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_TypeDeclaration133 = null;
-         var p_ExprSingle134 = null;
-         var p_WindowStartCondition135 = null;
-         var p_WindowEndCondition136 = null;
+         var p_TypeDeclaration132 = null;
+         var p_ExprSingle133 = null;
+         var p_WindowStartCondition134 = null;
+         var p_WindowEndCondition135 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:644:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
-            // xquery/XQueryParser.g:644:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
+            // xquery/XQueryParser.g:646:9: (k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )? )
+            // xquery/XQueryParser.g:646:11: k= SLIDING k= WINDOW d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] p_WindowStartCondition ( p_WindowEndCondition )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4215); if (this.state.failed) return retval;
+            k=this.match(this.input,SLIDING,XQueryParser.FOLLOW_SLIDING_in_p_SlidingWindowClause4219); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8187,7 +8192,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4221); if (this.state.failed) return retval;
+            k=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_SlidingWindowClause4225); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8195,12 +8200,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4227); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_SlidingWindowClause4231); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4231);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_SlidingWindowClause4235);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -8209,7 +8214,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:644:107: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:646:107: ( p_TypeDeclaration )?
             var alt62=2;
             var LA62_0 = this.input.LA(1);
 
@@ -8218,20 +8223,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt62) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:107: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235);
-                    p_TypeDeclaration133=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:646:107: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239);
+                    p_TypeDeclaration132=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration133.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration132.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4240); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_SlidingWindowClause4244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8239,19 +8244,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244);
-            p_ExprSingle134=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248);
+            p_ExprSingle133=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle134.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247);
-            p_WindowStartCondition135=this.p_WindowStartCondition();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle133.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251);
+            p_WindowStartCondition134=this.p_WindowStartCondition();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition135.getTree());
-            // xquery/XQueryParser.g:644:188: ( p_WindowEndCondition )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowStartCondition134.getTree());
+            // xquery/XQueryParser.g:646:188: ( p_WindowEndCondition )?
             var alt63=2;
             var LA63_0 = this.input.LA(1);
 
@@ -8260,13 +8265,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt63) {
                 case 1 :
-                    // xquery/XQueryParser.g:644:188: p_WindowEndCondition
-                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249);
-                    p_WindowEndCondition136=this.p_WindowEndCondition();
+                    // xquery/XQueryParser.g:646:188: p_WindowEndCondition
+                    this.pushFollow(XQueryParser.FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253);
+                    p_WindowEndCondition135=this.p_WindowEndCondition();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition136.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowEndCondition135.getTree());
 
 
                     break;
@@ -8309,7 +8314,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:648:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:650:1: p_WindowStartCondition : k= START p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowStartCondition"
     p_WindowStartCondition: function() {
         var retval = new XQueryParser.p_WindowStartCondition_return();
@@ -8318,17 +8323,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars137 = null;
-         var p_ExprSingle138 = null;
+         var p_WindowVars136 = null;
+         var p_ExprSingle137 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:649:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:649:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:651:9: (k= START p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:651:11: k= START p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4278); if (this.state.failed) return retval;
+            k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_WindowStartCondition4282); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8336,13 +8341,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4282);
-            p_WindowVars137=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowStartCondition4286);
+            p_WindowVars136=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars137.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4286); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars136.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowStartCondition4290); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8350,12 +8355,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290);
-            p_ExprSingle138=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294);
+            p_ExprSingle137=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle138.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle137.getTree());
 
 
 
@@ -8392,7 +8397,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:653:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:655:1: p_WindowEndCondition : (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] ;
     // $ANTLR start "p_WindowEndCondition"
     p_WindowEndCondition: function() {
         var retval = new XQueryParser.p_WindowEndCondition_return();
@@ -8401,17 +8406,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_WindowVars139 = null;
-         var p_ExprSingle140 = null;
+         var p_WindowVars138 = null;
+         var p_ExprSingle139 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:654:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:654:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
+            // xquery/XQueryParser.g:656:9: ( (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:656:11: (k= ONLY )? k= END p_WindowVars k= WHEN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:654:11: (k= ONLY )?
+            // xquery/XQueryParser.g:656:11: (k= ONLY )?
             var alt64=2;
             var LA64_0 = this.input.LA(1);
 
@@ -8420,8 +8425,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt64) {
                 case 1 :
-                    // xquery/XQueryParser.g:654:12: k= ONLY
-                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4320); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:656:12: k= ONLY
+                    k=this.match(this.input,ONLY,XQueryParser.FOLLOW_ONLY_in_p_WindowEndCondition4324); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -8435,7 +8440,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4328); if (this.state.failed) return retval;
+            k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_WindowEndCondition4332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8443,13 +8448,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4332);
-            p_WindowVars139=this.p_WindowVars();
+            this.pushFollow(XQueryParser.FOLLOW_p_WindowVars_in_p_WindowEndCondition4336);
+            p_WindowVars138=this.p_WindowVars();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars139.getTree());
-            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4336); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WindowVars138.getTree());
+            k=this.match(this.input,WHEN,XQueryParser.FOLLOW_WHEN_in_p_WindowEndCondition4340); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8457,12 +8462,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340);
-            p_ExprSingle140=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344);
+            p_ExprSingle139=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle140.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle139.getTree());
 
 
 
@@ -8499,7 +8504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:658:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
+    // xquery/XQueryParser.g:660:1: p_WindowVars : (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? ;
     // $ANTLR start "p_WindowVars"
     p_WindowVars: function() {
         var retval = new XQueryParser.p_WindowVars_return();
@@ -8509,24 +8514,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var k = null;
-        var DOLLAR142 = null;
-        var DOLLAR144 = null;
+        var DOLLAR141 = null;
+        var DOLLAR143 = null;
          var v = null;
-         var p_PositionalVar141 = null;
-         var p_PreviousItem143 = null;
-         var p_NextItem145 = null;
+         var p_PositionalVar140 = null;
+         var p_PreviousItem142 = null;
+         var p_NextItem144 = null;
 
         var d_tree=null;
         var k_tree=null;
-        var DOLLAR142_tree=null;
-        var DOLLAR144_tree=null;
+        var DOLLAR141_tree=null;
+        var DOLLAR143_tree=null;
 
         try {
-            // xquery/XQueryParser.g:659:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:9: ( (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )? )
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )? ( p_PositionalVar )? (k= PREVIOUS DOLLAR p_PreviousItem )? (k= NEXT DOLLAR p_NextItem )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:659:11: (d= DOLLAR v= p_CurrentItem )?
+            // xquery/XQueryParser.g:661:11: (d= DOLLAR v= p_CurrentItem )?
             var alt65=2;
             var LA65_0 = this.input.LA(1);
 
@@ -8535,13 +8540,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt65) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:12: d= DOLLAR v= p_CurrentItem
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4370); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:12: d= DOLLAR v= p_CurrentItem
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4374);
+                    this.pushFollow(XQueryParser.FOLLOW_p_CurrentItem_in_p_WindowVars4378);
                     v=this.p_CurrentItem();
 
                     this.state._fsp--;
@@ -8556,7 +8561,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:659:65: ( p_PositionalVar )?
+            // xquery/XQueryParser.g:661:65: ( p_PositionalVar )?
             var alt66=2;
             var LA66_0 = this.input.LA(1);
 
@@ -8565,20 +8570,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt66) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:65: p_PositionalVar
-                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4380);
-                    p_PositionalVar141=this.p_PositionalVar();
+                    // xquery/XQueryParser.g:661:65: p_PositionalVar
+                    this.pushFollow(XQueryParser.FOLLOW_p_PositionalVar_in_p_WindowVars4384);
+                    p_PositionalVar140=this.p_PositionalVar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar141.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PositionalVar140.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
+            // xquery/XQueryParser.g:661:82: (k= PREVIOUS DOLLAR p_PreviousItem )?
             var alt67=2;
             var LA67_0 = this.input.LA(1);
 
@@ -8587,8 +8592,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt67) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:83: k= PREVIOUS DOLLAR p_PreviousItem
-                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4386); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:83: k= PREVIOUS DOLLAR p_PreviousItem
+                    k=this.match(this.input,PREVIOUS,XQueryParser.FOLLOW_PREVIOUS_in_p_WindowVars4390); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -8596,24 +8601,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR142=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4390); if (this.state.failed) return retval;
+                    DOLLAR141=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4394); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR142_tree = this.adaptor.create(DOLLAR142);
-                    this.adaptor.addChild(root_0, DOLLAR142_tree);
+                    DOLLAR141_tree = this.adaptor.create(DOLLAR141);
+                    this.adaptor.addChild(root_0, DOLLAR141_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4392);
-                    p_PreviousItem143=this.p_PreviousItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PreviousItem_in_p_WindowVars4396);
+                    p_PreviousItem142=this.p_PreviousItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem143.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PreviousItem142.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:659:133: (k= NEXT DOLLAR p_NextItem )?
+            // xquery/XQueryParser.g:661:133: (k= NEXT DOLLAR p_NextItem )?
             var alt68=2;
             var LA68_0 = this.input.LA(1);
 
@@ -8622,8 +8627,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt68) {
                 case 1 :
-                    // xquery/XQueryParser.g:659:134: k= NEXT DOLLAR p_NextItem
-                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4399); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:661:134: k= NEXT DOLLAR p_NextItem
+                    k=this.match(this.input,NEXT,XQueryParser.FOLLOW_NEXT_in_p_WindowVars4403); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -8631,17 +8636,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    DOLLAR144=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4403); if (this.state.failed) return retval;
+                    DOLLAR143=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_WindowVars4407); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DOLLAR144_tree = this.adaptor.create(DOLLAR144);
-                    this.adaptor.addChild(root_0, DOLLAR144_tree);
+                    DOLLAR143_tree = this.adaptor.create(DOLLAR143);
+                    this.adaptor.addChild(root_0, DOLLAR143_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4405);
-                    p_NextItem145=this.p_NextItem();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NextItem_in_p_WindowVars4409);
+                    p_NextItem144=this.p_NextItem();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem145.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NextItem144.getTree());
 
 
                     break;
@@ -8684,7 +8689,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:663:1: p_CurrentItem : p_QName ;
+    // xquery/XQueryParser.g:665:1: p_CurrentItem : p_QName ;
     // $ANTLR start "p_CurrentItem"
     p_CurrentItem: function() {
         var retval = new XQueryParser.p_CurrentItem_return();
@@ -8692,20 +8697,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName146 = null;
+         var p_QName145 = null;
 
 
         try {
-            // xquery/XQueryParser.g:664:9: ( p_QName )
-            // xquery/XQueryParser.g:664:11: p_QName
+            // xquery/XQueryParser.g:666:9: ( p_QName )
+            // xquery/XQueryParser.g:666:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4433);
-            p_QName146=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CurrentItem4437);
+            p_QName145=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName145.getTree());
 
 
 
@@ -8742,7 +8747,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:668:1: p_PreviousItem : p_QName ;
+    // xquery/XQueryParser.g:670:1: p_PreviousItem : p_QName ;
     // $ANTLR start "p_PreviousItem"
     p_PreviousItem: function() {
         var retval = new XQueryParser.p_PreviousItem_return();
@@ -8750,20 +8755,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName147 = null;
+         var p_QName146 = null;
 
 
         try {
-            // xquery/XQueryParser.g:669:9: ( p_QName )
-            // xquery/XQueryParser.g:669:11: p_QName
+            // xquery/XQueryParser.g:671:9: ( p_QName )
+            // xquery/XQueryParser.g:671:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4459);
-            p_QName147=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_PreviousItem4463);
+            p_QName146=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName146.getTree());
 
 
 
@@ -8800,7 +8805,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:673:1: p_NextItem : p_QName ;
+    // xquery/XQueryParser.g:675:1: p_NextItem : p_QName ;
     // $ANTLR start "p_NextItem"
     p_NextItem: function() {
         var retval = new XQueryParser.p_NextItem_return();
@@ -8808,20 +8813,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName148 = null;
+         var p_QName147 = null;
 
 
         try {
-            // xquery/XQueryParser.g:674:9: ( p_QName )
-            // xquery/XQueryParser.g:674:11: p_QName
+            // xquery/XQueryParser.g:676:9: ( p_QName )
+            // xquery/XQueryParser.g:676:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4485);
-            p_QName148=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NextItem4489);
+            p_QName147=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName148.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName147.getTree());
 
 
 
@@ -8858,7 +8863,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:678:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:680:1: p_CountClause : k= COUNT d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_CountClause"
     p_CountClause: function() {
         var retval = new XQueryParser.p_CountClause_return();
@@ -8874,11 +8879,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:679:9: (k= COUNT d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:679:11: k= COUNT d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:681:9: (k= COUNT d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:681:11: k= COUNT d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4513); if (this.state.failed) return retval;
+            k=this.match(this.input,COUNT,XQueryParser.FOLLOW_COUNT_in_p_CountClause4517); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8886,12 +8891,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4519); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CountClause4523); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4523);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CountClause4527);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -8936,7 +8941,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:683:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:685:1: p_WhereClause : k= WHERE p_ExprSingle[true] ;
     // $ANTLR start "p_WhereClause"
     p_WhereClause: function() {
         var retval = new XQueryParser.p_WhereClause_return();
@@ -8945,16 +8950,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ExprSingle149 = null;
+         var p_ExprSingle148 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:684:9: (k= WHERE p_ExprSingle[true] )
-            // xquery/XQueryParser.g:684:11: k= WHERE p_ExprSingle[true]
+            // xquery/XQueryParser.g:686:9: (k= WHERE p_ExprSingle[true] )
+            // xquery/XQueryParser.g:686:11: k= WHERE p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4561); if (this.state.failed) return retval;
+            k=this.match(this.input,WHERE,XQueryParser.FOLLOW_WHERE_in_p_WhereClause4565); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -8962,12 +8967,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4565);
-            p_ExprSingle149=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_WhereClause4569);
+            p_ExprSingle148=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle149.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle148.getTree());
 
 
 
@@ -9004,7 +9009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:688:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
+    // xquery/XQueryParser.g:690:1: p_GroupByClause : k= GROUP k= BY p_GroupingSpecList ;
     // $ANTLR start "p_GroupByClause"
     p_GroupByClause: function() {
         var retval = new XQueryParser.p_GroupByClause_return();
@@ -9013,16 +9018,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_GroupingSpecList150 = null;
+         var p_GroupingSpecList149 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:689:9: (k= GROUP k= BY p_GroupingSpecList )
-            // xquery/XQueryParser.g:689:11: k= GROUP k= BY p_GroupingSpecList
+            // xquery/XQueryParser.g:691:9: (k= GROUP k= BY p_GroupingSpecList )
+            // xquery/XQueryParser.g:691:11: k= GROUP k= BY p_GroupingSpecList
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4594); if (this.state.failed) return retval;
+            k=this.match(this.input,GROUP,XQueryParser.FOLLOW_GROUP_in_p_GroupByClause4598); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -9030,7 +9035,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4600); if (this.state.failed) return retval;
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_GroupByClause4604); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -9038,12 +9043,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604);
-            p_GroupingSpecList150=this.p_GroupingSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608);
+            p_GroupingSpecList149=this.p_GroupingSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList150.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpecList149.getTree());
 
 
 
@@ -9080,7 +9085,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:693:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
+    // xquery/XQueryParser.g:695:1: p_GroupingSpecList : p_GroupingSpec ( COMMA p_GroupingSpec )* ;
     // $ANTLR start "p_GroupingSpecList"
     p_GroupingSpecList: function() {
         var retval = new XQueryParser.p_GroupingSpecList_return();
@@ -9088,24 +9093,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA152 = null;
-         var p_GroupingSpec151 = null;
-         var p_GroupingSpec153 = null;
+        var COMMA151 = null;
+         var p_GroupingSpec150 = null;
+         var p_GroupingSpec152 = null;
 
-        var COMMA152_tree=null;
+        var COMMA151_tree=null;
 
         try {
-            // xquery/XQueryParser.g:694:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
-            // xquery/XQueryParser.g:694:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
+            // xquery/XQueryParser.g:696:9: ( p_GroupingSpec ( COMMA p_GroupingSpec )* )
+            // xquery/XQueryParser.g:696:11: p_GroupingSpec ( COMMA p_GroupingSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630);
-            p_GroupingSpec151=this.p_GroupingSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634);
+            p_GroupingSpec150=this.p_GroupingSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec151.getTree());
-            // xquery/XQueryParser.g:694:26: ( COMMA p_GroupingSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec150.getTree());
+            // xquery/XQueryParser.g:696:26: ( COMMA p_GroupingSpec )*
             loop69:
             do {
                 var alt69=2;
@@ -9118,18 +9123,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt69) {
                 case 1 :
-                    // xquery/XQueryParser.g:694:27: COMMA p_GroupingSpec
-                    COMMA152=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4633); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:696:27: COMMA p_GroupingSpec
+                    COMMA151=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_GroupingSpecList4637); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA152_tree = this.adaptor.create(COMMA152);
-                    this.adaptor.addChild(root_0, COMMA152_tree);
+                    COMMA151_tree = this.adaptor.create(COMMA151);
+                    this.adaptor.addChild(root_0, COMMA151_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635);
-                    p_GroupingSpec153=this.p_GroupingSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639);
+                    p_GroupingSpec152=this.p_GroupingSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec153.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GroupingSpec152.getTree());
 
 
                     break;
@@ -9175,7 +9180,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:698:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:700:1: p_GroupingSpec : d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_GroupingSpec"
     p_GroupingSpec: function() {
         var retval = new XQueryParser.p_GroupingSpec_return();
@@ -9186,22 +9191,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_StringLiteral154 = null;
+         var p_StringLiteral153 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:699:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:699:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:9: (d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:701:11: d= DOLLAR v= p_VarName (k= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4665); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_GroupingSpec4669); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4669);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_GroupingSpec4673);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -9210,7 +9215,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:699:58: (k= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:701:58: (k= COLLATION p_StringLiteral )?
             var alt70=2;
             var LA70_0 = this.input.LA(1);
 
@@ -9219,8 +9224,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt70) {
                 case 1 :
-                    // xquery/XQueryParser.g:699:59: k= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4676); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:701:59: k= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_GroupingSpec4680); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9228,12 +9233,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4680);
-                    p_StringLiteral154=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_GroupingSpec4684);
+                    p_StringLiteral153=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral154.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral153.getTree());
 
 
                     break;
@@ -9276,7 +9281,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:703:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
+    // xquery/XQueryParser.g:705:1: p_OrderByClause : ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList ;
     // $ANTLR start "p_OrderByClause"
     p_OrderByClause: function() {
         var retval = new XQueryParser.p_OrderByClause_return();
@@ -9286,16 +9291,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_OrderSpecList155 = null;
+         var p_OrderSpecList154 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:704:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
+            // xquery/XQueryParser.g:706:9: ( ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) ) p_OrderSpecList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:704:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
+            // xquery/XQueryParser.g:706:11: ( (k+= ORDER k+= BY ) | (k+= STABLE k+= ORDER k+= BY ) )
             var alt71=2;
             var LA71_0 = this.input.LA(1);
 
@@ -9314,10 +9319,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt71) {
                 case 1 :
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:12: (k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:13: k+= ORDER k+= BY
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4712); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:12: (k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:13: k+= ORDER k+= BY
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4716); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9325,7 +9330,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4716); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9340,10 +9345,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:31: (k+= STABLE k+= ORDER k+= BY )
-                    // xquery/XQueryParser.g:704:32: k+= STABLE k+= ORDER k+= BY
-                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4724); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:31: (k+= STABLE k+= ORDER k+= BY )
+                    // xquery/XQueryParser.g:706:32: k+= STABLE k+= ORDER k+= BY
+                    k=this.match(this.input,STABLE,XQueryParser.FOLLOW_STABLE_in_p_OrderByClause4728); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9351,7 +9356,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4728); if (this.state.failed) return retval;
+                    k=this.match(this.input,ORDER,XQueryParser.FOLLOW_ORDER_in_p_OrderByClause4732); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9359,7 +9364,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4732); if (this.state.failed) return retval;
+                    k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_OrderByClause4736); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9379,12 +9384,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4738);
-            p_OrderSpecList155=this.p_OrderSpecList();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpecList_in_p_OrderByClause4742);
+            p_OrderSpecList154=this.p_OrderSpecList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList155.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpecList154.getTree());
 
 
 
@@ -9421,7 +9426,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:708:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
+    // xquery/XQueryParser.g:710:1: p_OrderSpecList : p_OrderSpec ( COMMA p_OrderSpec )* ;
     // $ANTLR start "p_OrderSpecList"
     p_OrderSpecList: function() {
         var retval = new XQueryParser.p_OrderSpecList_return();
@@ -9429,24 +9434,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMA157 = null;
-         var p_OrderSpec156 = null;
-         var p_OrderSpec158 = null;
+        var COMMA156 = null;
+         var p_OrderSpec155 = null;
+         var p_OrderSpec157 = null;
 
-        var COMMA157_tree=null;
+        var COMMA156_tree=null;
 
         try {
-            // xquery/XQueryParser.g:709:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
-            // xquery/XQueryParser.g:709:11: p_OrderSpec ( COMMA p_OrderSpec )*
+            // xquery/XQueryParser.g:711:9: ( p_OrderSpec ( COMMA p_OrderSpec )* )
+            // xquery/XQueryParser.g:711:11: p_OrderSpec ( COMMA p_OrderSpec )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4764);
-            p_OrderSpec156=this.p_OrderSpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4768);
+            p_OrderSpec155=this.p_OrderSpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec156.getTree());
-            // xquery/XQueryParser.g:709:23: ( COMMA p_OrderSpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec155.getTree());
+            // xquery/XQueryParser.g:711:23: ( COMMA p_OrderSpec )*
             loop72:
             do {
                 var alt72=2;
@@ -9459,18 +9464,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt72) {
                 case 1 :
-                    // xquery/XQueryParser.g:709:24: COMMA p_OrderSpec
-                    COMMA157=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4767); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:711:24: COMMA p_OrderSpec
+                    COMMA156=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_OrderSpecList4771); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA157_tree = this.adaptor.create(COMMA157);
-                    this.adaptor.addChild(root_0, COMMA157_tree);
+                    COMMA156_tree = this.adaptor.create(COMMA156);
+                    this.adaptor.addChild(root_0, COMMA156_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4769);
-                    p_OrderSpec158=this.p_OrderSpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderSpec_in_p_OrderSpecList4773);
+                    p_OrderSpec157=this.p_OrderSpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec158.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderSpec157.getTree());
 
 
                     break;
@@ -9516,7 +9521,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:713:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
+    // xquery/XQueryParser.g:715:1: p_OrderSpec : p_ExprSingle[true] p_OrderModifier ;
     // $ANTLR start "p_OrderSpec"
     p_OrderSpec: function() {
         var retval = new XQueryParser.p_OrderSpec_return();
@@ -9524,27 +9529,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle159 = null;
-         var p_OrderModifier160 = null;
+         var p_ExprSingle158 = null;
+         var p_OrderModifier159 = null;
 
 
         try {
-            // xquery/XQueryParser.g:714:9: ( p_ExprSingle[true] p_OrderModifier )
-            // xquery/XQueryParser.g:714:11: p_ExprSingle[true] p_OrderModifier
+            // xquery/XQueryParser.g:716:9: ( p_ExprSingle[true] p_OrderModifier )
+            // xquery/XQueryParser.g:716:11: p_ExprSingle[true] p_OrderModifier
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4797);
-            p_ExprSingle159=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_OrderSpec4801);
+            p_ExprSingle158=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle159.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4800);
-            p_OrderModifier160=this.p_OrderModifier();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle158.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_OrderModifier_in_p_OrderSpec4804);
+            p_OrderModifier159=this.p_OrderModifier();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier160.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderModifier159.getTree());
 
 
 
@@ -9581,7 +9586,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:718:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
+    // xquery/XQueryParser.g:720:1: p_OrderModifier : (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? ;
     // $ANTLR start "p_OrderModifier"
     p_OrderModifier: function() {
         var retval = new XQueryParser.p_OrderModifier_return();
@@ -9591,16 +9596,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral161 = null;
+         var p_StringLiteral160 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:719:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:9: ( (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )? )
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )? (k+= EMPTY (k+= GREATEST | k+= LEAST ) )? (k+= COLLATION p_StringLiteral )?
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:719:11: (k+= ASCENDING | k+= DESCENDING )?
+            // xquery/XQueryParser.g:721:11: (k+= ASCENDING | k+= DESCENDING )?
             var alt73=3;
             var LA73_0 = this.input.LA(1);
 
@@ -9612,8 +9617,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt73) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:12: k+= ASCENDING
-                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4829); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:12: k+= ASCENDING
+                    k=this.match(this.input,ASCENDING,XQueryParser.FOLLOW_ASCENDING_in_p_OrderModifier4833); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9625,8 +9630,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:719:27: k+= DESCENDING
-                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4835); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:27: k+= DESCENDING
+                    k=this.match(this.input,DESCENDING,XQueryParser.FOLLOW_DESCENDING_in_p_OrderModifier4839); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9640,7 +9645,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
+            // xquery/XQueryParser.g:721:43: (k+= EMPTY (k+= GREATEST | k+= LEAST ) )?
             var alt75=2;
             var LA75_0 = this.input.LA(1);
 
@@ -9649,8 +9654,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt75) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
-                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4842); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:44: k+= EMPTY (k+= GREATEST | k+= LEAST )
+                    k=this.match(this.input,EMPTY,XQueryParser.FOLLOW_EMPTY_in_p_OrderModifier4846); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9658,7 +9663,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:719:53: (k+= GREATEST | k+= LEAST )
+                    // xquery/XQueryParser.g:721:53: (k+= GREATEST | k+= LEAST )
                     var alt74=2;
                     var LA74_0 = this.input.LA(1);
 
@@ -9677,8 +9682,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt74) {
                         case 1 :
-                            // xquery/XQueryParser.g:719:54: k+= GREATEST
-                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4847); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:54: k+= GREATEST
+                            k=this.match(this.input,GREATEST,XQueryParser.FOLLOW_GREATEST_in_p_OrderModifier4851); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -9690,8 +9695,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:719:68: k+= LEAST
-                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4853); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:721:68: k+= LEAST
+                            k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_OrderModifier4857); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -9711,7 +9716,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            // xquery/XQueryParser.g:719:80: (k+= COLLATION p_StringLiteral )?
+            // xquery/XQueryParser.g:721:80: (k+= COLLATION p_StringLiteral )?
             var alt76=2;
             var LA76_0 = this.input.LA(1);
 
@@ -9720,8 +9725,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt76) {
                 case 1 :
-                    // xquery/XQueryParser.g:719:81: k+= COLLATION p_StringLiteral
-                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4861); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:721:81: k+= COLLATION p_StringLiteral
+                    k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_OrderModifier4865); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9729,12 +9734,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4863);
-                    p_StringLiteral161=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_OrderModifier4867);
+                    p_StringLiteral160=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral161.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral160.getTree());
 
 
                     break;
@@ -9780,7 +9785,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:723:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:725:1: p_ReturnHybrid[strict] : k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_ReturnHybrid"
     p_ReturnHybrid: function(strict) {
         var retval = new XQueryParser.p_ReturnHybrid_return();
@@ -9789,16 +9794,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid162 = null;
+         var p_Hybrid161 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:724:9: (k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:724:11: k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:726:9: (k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:726:11: k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4896); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnHybrid4900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -9806,12 +9811,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4900);
-            p_Hybrid162=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnHybrid4904);
+            p_Hybrid161=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid162.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid161.getTree());
 
 
 
@@ -9848,7 +9853,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:728:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:730:1: p_QuantifiedExpr : (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] ;
     // $ANTLR start "p_QuantifiedExpr"
     p_QuantifiedExpr: function() {
         var retval = new XQueryParser.p_QuantifiedExpr_return();
@@ -9859,26 +9864,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var COMMA165 = null;
+        var COMMA164 = null;
          var v = null;
          var w = null;
-         var p_TypeDeclaration163 = null;
-         var p_ExprSingle164 = null;
-         var p_TypeDeclaration166 = null;
+         var p_TypeDeclaration162 = null;
+         var p_ExprSingle163 = null;
+         var p_TypeDeclaration165 = null;
+         var p_ExprSingle166 = null;
          var p_ExprSingle167 = null;
-         var p_ExprSingle168 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var COMMA165_tree=null;
+        var COMMA164_tree=null;
 
         try {
-            // xquery/XQueryParser.g:729:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
+            // xquery/XQueryParser.g:731:9: ( (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true] )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY ) d= DOLLAR v= p_VarName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )* k= SATISFIES p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:729:11: (k= SOME | k= EVERY )
+            // xquery/XQueryParser.g:731:11: (k= SOME | k= EVERY )
             var alt77=2;
             var LA77_0 = this.input.LA(1);
 
@@ -9897,8 +9902,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt77) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:12: k= SOME
-                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4930); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:12: k= SOME
+                    k=this.match(this.input,SOME,XQueryParser.FOLLOW_SOME_in_p_QuantifiedExpr4934); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9907,8 +9912,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:729:21: k= EVERY
-                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4936); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:21: k= EVERY
+                    k=this.match(this.input,EVERY,XQueryParser.FOLLOW_EVERY_in_p_QuantifiedExpr4940); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -9922,12 +9927,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4943); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4947); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4947);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_QuantifiedExpr4951);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -9936,7 +9941,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:729:92: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:731:92: ( p_TypeDeclaration )?
             var alt78=2;
             var LA78_0 = this.input.LA(1);
 
@@ -9945,20 +9950,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt78) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:92: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951);
-                    p_TypeDeclaration163=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:731:92: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955);
+                    p_TypeDeclaration162=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration163.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration162.getTree());
 
 
                     break;
 
             }
 
-            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4956); if (this.state.failed) return retval;
+            k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4960); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -9966,13 +9971,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960);
-            p_ExprSingle164=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964);
+            p_ExprSingle163=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle164.getTree());
-            // xquery/XQueryParser.g:729:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle163.getTree());
+            // xquery/XQueryParser.g:731:150: ( COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true] )*
             loop80:
             do {
                 var alt80=2;
@@ -9985,18 +9990,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt80) {
                 case 1 :
-                    // xquery/XQueryParser.g:729:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
-                    COMMA165=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4964); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:731:151: COMMA e= DOLLAR w= p_QName ( p_TypeDeclaration )? k= IN p_ExprSingle[true]
+                    COMMA164=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA165_tree = this.adaptor.create(COMMA165);
-                    this.adaptor.addChild(root_0, COMMA165_tree);
+                    COMMA164_tree = this.adaptor.create(COMMA164);
+                    this.adaptor.addChild(root_0, COMMA164_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4968); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_QuantifiedExpr4972); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4972);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_QuantifiedExpr4976);
                     w=this.p_QName();
 
                     this.state._fsp--;
@@ -10005,7 +10010,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.av(e, (w?w.stop:null));
                     }
-                    // xquery/XQueryParser.g:729:200: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:731:200: ( p_TypeDeclaration )?
                     var alt79=2;
                     var LA79_0 = this.input.LA(1);
 
@@ -10014,20 +10019,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt79) {
                         case 1 :
-                            // xquery/XQueryParser.g:729:200: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976);
-                            p_TypeDeclaration166=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:731:200: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980);
+                            p_TypeDeclaration165=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration166.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration165.getTree());
 
 
                             break;
 
                     }
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4981); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_QuantifiedExpr4985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -10035,12 +10040,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985);
-                    p_ExprSingle167=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989);
+                    p_ExprSingle166=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle166.getTree());
 
 
                     break;
@@ -10050,7 +10055,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4992); if (this.state.failed) return retval;
+            k=this.match(this.input,SATISFIES,XQueryParser.FOLLOW_SATISFIES_in_p_QuantifiedExpr4996); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10058,12 +10063,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996);
-            p_ExprSingle168=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000);
+            p_ExprSingle167=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle168.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle167.getTree());
 
 
 
@@ -10100,7 +10105,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:733:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:735:1: p_SwitchHybrid[strict] : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchHybrid"
     p_SwitchHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchHybrid_return();
@@ -10109,22 +10114,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN169 = null;
-        var RPAREN171 = null;
-         var p_Expr170 = null;
-         var p_SwitchCaseHybrid172 = null;
-         var p_Hybrid173 = null;
+        var LPAREN168 = null;
+        var RPAREN170 = null;
+         var p_Expr169 = null;
+         var p_SwitchCaseHybrid171 = null;
+         var p_Hybrid172 = null;
 
         var k_tree=null;
-        var LPAREN169_tree=null;
-        var RPAREN171_tree=null;
+        var LPAREN168_tree=null;
+        var RPAREN170_tree=null;
 
         try {
-            // xquery/XQueryParser.g:734:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:734:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:736:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:736:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseHybrid[$strict] )+ k= DEFAULT k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5026); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10132,23 +10137,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN169=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5030); if (this.state.failed) return retval;
+            LPAREN168=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchHybrid5034); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN169_tree = this.adaptor.create(LPAREN169);
-            this.adaptor.addChild(root_0, LPAREN169_tree);
+            LPAREN168_tree = this.adaptor.create(LPAREN168);
+            this.adaptor.addChild(root_0, LPAREN168_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5032);
-            p_Expr170=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchHybrid5036);
+            p_Expr169=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr170.getTree());
-            RPAREN171=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5035); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr169.getTree());
+            RPAREN170=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchHybrid5039); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN171_tree = this.adaptor.create(RPAREN171);
-            this.adaptor.addChild(root_0, RPAREN171_tree);
+            RPAREN170_tree = this.adaptor.create(RPAREN170);
+            this.adaptor.addChild(root_0, RPAREN170_tree);
             }
-            // xquery/XQueryParser.g:734:67: ( p_SwitchCaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:736:67: ( p_SwitchCaseHybrid[$strict] )+
             var cnt81=0;
             loop81:
             do {
@@ -10162,13 +10167,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt81) {
                 case 1 :
-                    // xquery/XQueryParser.g:734:67: p_SwitchCaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037);
-                    p_SwitchCaseHybrid172=this.p_SwitchCaseHybrid(strict);
+                    // xquery/XQueryParser.g:736:67: p_SwitchCaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041);
+                    p_SwitchCaseHybrid171=this.p_SwitchCaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid172.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseHybrid171.getTree());
 
 
                     break;
@@ -10184,7 +10189,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt81++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5043); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchHybrid5047); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10192,7 +10197,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5049); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchHybrid5053); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10200,12 +10205,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5053);
-            p_Hybrid173=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchHybrid5057);
+            p_Hybrid172=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid173.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid172.getTree());
 
 
 
@@ -10242,7 +10247,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:738:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:740:1: p_SwitchCaseHybrid[strict] : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_SwitchCaseHybrid"
     p_SwitchCaseHybrid: function(strict) {
         var retval = new XQueryParser.p_SwitchCaseHybrid_return();
@@ -10251,17 +10256,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand174 = null;
-         var p_Hybrid175 = null;
+         var p_SwitchCaseOperand173 = null;
+         var p_Hybrid174 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:739:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:741:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:739:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:741:11: (k= CASE p_SwitchCaseOperand )+
             var cnt82=0;
             loop82:
             do {
@@ -10275,8 +10280,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt82) {
                 case 1 :
-                    // xquery/XQueryParser.g:739:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:741:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseHybrid5088); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -10284,12 +10289,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088);
-                    p_SwitchCaseOperand174=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092);
+                    p_SwitchCaseOperand173=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand174.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand173.getTree());
 
 
                     break;
@@ -10305,7 +10310,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt82++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5094); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseHybrid5098); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10313,12 +10318,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098);
-            p_Hybrid175=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102);
+            p_Hybrid174=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid175.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid174.getTree());
 
 
 
@@ -10355,7 +10360,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:743:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:745:1: p_SwitchCaseOperand : p_ExprSingle[true] ;
     // $ANTLR start "p_SwitchCaseOperand"
     p_SwitchCaseOperand: function() {
         var retval = new XQueryParser.p_SwitchCaseOperand_return();
@@ -10363,20 +10368,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle176 = null;
+         var p_ExprSingle175 = null;
 
 
         try {
-            // xquery/XQueryParser.g:744:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:744:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:746:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:746:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125);
-            p_ExprSingle176=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129);
+            p_ExprSingle175=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle176.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle175.getTree());
 
 
 
@@ -10413,7 +10418,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:748:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:750:1: p_TypeswitchHybrid[strict] : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] ;
     // $ANTLR start "p_TypeswitchHybrid"
     p_TypeswitchHybrid: function(strict) {
         var retval = new XQueryParser.p_TypeswitchHybrid_return();
@@ -10423,24 +10428,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN177 = null;
-        var RPAREN179 = null;
+        var LPAREN176 = null;
+        var RPAREN178 = null;
          var v = null;
-         var p_Expr178 = null;
-         var p_CaseHybrid180 = null;
-         var p_Hybrid181 = null;
+         var p_Expr177 = null;
+         var p_CaseHybrid179 = null;
+         var p_Hybrid180 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN177_tree=null;
-        var RPAREN179_tree=null;
+        var LPAREN176_tree=null;
+        var RPAREN178_tree=null;
 
         try {
-            // xquery/XQueryParser.g:749:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:749:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:751:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:751:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseHybrid[$strict] )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10448,23 +10453,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN177=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5159); if (this.state.failed) return retval;
+            LPAREN176=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchHybrid5163); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN177_tree = this.adaptor.create(LPAREN177);
-            this.adaptor.addChild(root_0, LPAREN177_tree);
+            LPAREN176_tree = this.adaptor.create(LPAREN176);
+            this.adaptor.addChild(root_0, LPAREN176_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5161);
-            p_Expr178=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchHybrid5165);
+            p_Expr177=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr178.getTree());
-            RPAREN179=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5164); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr177.getTree());
+            RPAREN178=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchHybrid5168); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN179_tree = this.adaptor.create(RPAREN179);
-            this.adaptor.addChild(root_0, RPAREN179_tree);
+            RPAREN178_tree = this.adaptor.create(RPAREN178);
+            this.adaptor.addChild(root_0, RPAREN178_tree);
             }
-            // xquery/XQueryParser.g:749:71: ( p_CaseHybrid[$strict] )+
+            // xquery/XQueryParser.g:751:71: ( p_CaseHybrid[$strict] )+
             var cnt83=0;
             loop83:
             do {
@@ -10478,13 +10483,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt83) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:71: p_CaseHybrid[$strict]
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166);
-                    p_CaseHybrid180=this.p_CaseHybrid(strict);
+                    // xquery/XQueryParser.g:751:71: p_CaseHybrid[$strict]
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170);
+                    p_CaseHybrid179=this.p_CaseHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid180.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseHybrid179.getTree());
 
 
                     break;
@@ -10500,7 +10505,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt83++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10508,7 +10513,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:749:119: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:751:119: (d= DOLLAR v= p_VarName )?
             var alt84=2;
             var LA84_0 = this.input.LA(1);
 
@@ -10517,13 +10522,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt84) {
                 case 1 :
-                    // xquery/XQueryParser.g:749:120: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:751:120: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5183);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchHybrid5187);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -10538,7 +10543,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5191); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchHybrid5195); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10546,12 +10551,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195);
-            p_Hybrid181=this.p_Hybrid(strict, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199);
+            p_Hybrid180=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid181.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid180.getTree());
 
 
 
@@ -10588,7 +10593,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:753:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
+    // xquery/XQueryParser.g:755:1: p_CaseHybrid[strict] : k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] ;
     // $ANTLR start "p_CaseHybrid"
     p_CaseHybrid: function(strict) {
         var retval = new XQueryParser.p_CaseHybrid_return();
@@ -10599,18 +10604,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_SequenceTypeUnion182 = null;
-         var p_ExprSingle183 = null;
+         var p_SequenceTypeUnion181 = null;
+         var p_ExprSingle182 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:754:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
-            // xquery/XQueryParser.g:754:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
+            // xquery/XQueryParser.g:756:9: (k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false] )
+            // xquery/XQueryParser.g:756:11: k= CASE (d= DOLLAR v= p_VarName k= AS )? p_SequenceTypeUnion k= RETURN p_ExprSingle[false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5225); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseHybrid5229); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10618,7 +10623,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:754:33: (d= DOLLAR v= p_VarName k= AS )?
+            // xquery/XQueryParser.g:756:33: (d= DOLLAR v= p_VarName k= AS )?
             var alt85=2;
             var LA85_0 = this.input.LA(1);
 
@@ -10627,13 +10632,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt85) {
                 case 1 :
-                    // xquery/XQueryParser.g:754:34: d= DOLLAR v= p_VarName k= AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5232); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:756:34: d= DOLLAR v= p_VarName k= AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseHybrid5236); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5236);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseHybrid5240);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -10642,7 +10647,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5242); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseHybrid5246); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -10656,13 +10661,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248);
-            p_SequenceTypeUnion182=this.p_SequenceTypeUnion();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252);
+            p_SequenceTypeUnion181=this.p_SequenceTypeUnion();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion182.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5252); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceTypeUnion181.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseHybrid5256); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10670,12 +10675,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5256);
-            p_ExprSingle183=this.p_ExprSingle(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_CaseHybrid5260);
+            p_ExprSingle182=this.p_ExprSingle(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle183.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle182.getTree());
 
 
 
@@ -10712,7 +10717,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:758:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
+    // xquery/XQueryParser.g:760:1: p_SequenceTypeUnion : p_SequenceType ( VBAR p_SequenceType )* ;
     // $ANTLR start "p_SequenceTypeUnion"
     p_SequenceTypeUnion: function() {
         var retval = new XQueryParser.p_SequenceTypeUnion_return();
@@ -10720,24 +10725,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR185 = null;
-         var p_SequenceType184 = null;
-         var p_SequenceType186 = null;
+        var VBAR184 = null;
+         var p_SequenceType183 = null;
+         var p_SequenceType185 = null;
 
-        var VBAR185_tree=null;
+        var VBAR184_tree=null;
 
         try {
-            // xquery/XQueryParser.g:759:9: ( p_SequenceType ( VBAR p_SequenceType )* )
-            // xquery/XQueryParser.g:759:11: p_SequenceType ( VBAR p_SequenceType )*
+            // xquery/XQueryParser.g:761:9: ( p_SequenceType ( VBAR p_SequenceType )* )
+            // xquery/XQueryParser.g:761:11: p_SequenceType ( VBAR p_SequenceType )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283);
-            p_SequenceType184=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287);
+            p_SequenceType183=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType184.getTree());
-            // xquery/XQueryParser.g:759:26: ( VBAR p_SequenceType )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType183.getTree());
+            // xquery/XQueryParser.g:761:26: ( VBAR p_SequenceType )*
             loop86:
             do {
                 var alt86=2;
@@ -10750,18 +10755,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt86) {
                 case 1 :
-                    // xquery/XQueryParser.g:759:27: VBAR p_SequenceType
-                    VBAR185=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5286); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:761:27: VBAR p_SequenceType
+                    VBAR184=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_SequenceTypeUnion5290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    VBAR185_tree = this.adaptor.create(VBAR185);
-                    this.adaptor.addChild(root_0, VBAR185_tree);
+                    VBAR184_tree = this.adaptor.create(VBAR184);
+                    this.adaptor.addChild(root_0, VBAR184_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288);
-                    p_SequenceType186=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292);
+                    p_SequenceType185=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType186.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType185.getTree());
 
 
                     break;
@@ -10807,7 +10812,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:763:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
+    // xquery/XQueryParser.g:765:1: p_IfHybrid[strict] : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] ;
     // $ANTLR start "p_IfHybrid"
     p_IfHybrid: function(strict) {
         var retval = new XQueryParser.p_IfHybrid_return();
@@ -10816,22 +10821,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN187 = null;
-        var RPAREN189 = null;
-         var p_Expr188 = null;
+        var LPAREN186 = null;
+        var RPAREN188 = null;
+         var p_Expr187 = null;
+         var p_Hybrid189 = null;
          var p_Hybrid190 = null;
-         var p_Hybrid191 = null;
 
         var k_tree=null;
-        var LPAREN187_tree=null;
-        var RPAREN189_tree=null;
+        var LPAREN186_tree=null;
+        var RPAREN188_tree=null;
 
         try {
-            // xquery/XQueryParser.g:764:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
-            // xquery/XQueryParser.g:764:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
+            // xquery/XQueryParser.g:766:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false] )
+            // xquery/XQueryParser.g:766:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[$strict,false] k= ELSE p_Hybrid[$strict,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5319); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfHybrid5323); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10839,23 +10844,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN187=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5323); if (this.state.failed) return retval;
+            LPAREN186=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfHybrid5327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN187_tree = this.adaptor.create(LPAREN187);
-            this.adaptor.addChild(root_0, LPAREN187_tree);
+            LPAREN186_tree = this.adaptor.create(LPAREN186);
+            this.adaptor.addChild(root_0, LPAREN186_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5325);
-            p_Expr188=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfHybrid5329);
+            p_Expr187=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr188.getTree());
-            RPAREN189=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5328); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr187.getTree());
+            RPAREN188=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfHybrid5332); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN189_tree = this.adaptor.create(RPAREN189);
-            this.adaptor.addChild(root_0, RPAREN189_tree);
+            RPAREN188_tree = this.adaptor.create(RPAREN188);
+            this.adaptor.addChild(root_0, RPAREN188_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5332); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfHybrid5336); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -10863,26 +10868,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5336);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5340);
+            p_Hybrid189=this.p_Hybrid(strict, false);
+
+            this.state._fsp--;
+            if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid189.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) {
+            k_tree = this.adaptor.create(k);
+            this.adaptor.addChild(root_0, k_tree);
+            }
+            if ( this.state.backtracking===0 ) {
+              this.ak(k);
+            }
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5349);
             p_Hybrid190=this.p_Hybrid(strict, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid190.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfHybrid5341); if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) {
-            k_tree = this.adaptor.create(k);
-            this.adaptor.addChild(root_0, k_tree);
-            }
-            if ( this.state.backtracking===0 ) {
-              this.ak(k);
-            }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfHybrid5345);
-            p_Hybrid191=this.p_Hybrid(strict, false);
-
-            this.state._fsp--;
-            if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid191.getTree());
 
 
 
@@ -10919,7 +10924,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:768:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
+    // xquery/XQueryParser.g:770:1: p_TryCatchExpr : p_TryClause ( p_CatchClause )+ ;
     // $ANTLR start "p_TryCatchExpr"
     p_TryCatchExpr: function() {
         var retval = new XQueryParser.p_TryCatchExpr_return();
@@ -10927,22 +10932,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_TryClause192 = null;
-         var p_CatchClause193 = null;
+         var p_TryClause191 = null;
+         var p_CatchClause192 = null;
 
 
         try {
-            // xquery/XQueryParser.g:769:9: ( p_TryClause ( p_CatchClause )+ )
-            // xquery/XQueryParser.g:769:11: p_TryClause ( p_CatchClause )+
+            // xquery/XQueryParser.g:771:9: ( p_TryClause ( p_CatchClause )+ )
+            // xquery/XQueryParser.g:771:11: p_TryClause ( p_CatchClause )+
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5372);
-            p_TryClause192=this.p_TryClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryClause_in_p_TryCatchExpr5376);
+            p_TryClause191=this.p_TryClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause192.getTree());
-            // xquery/XQueryParser.g:769:23: ( p_CatchClause )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryClause191.getTree());
+            // xquery/XQueryParser.g:771:23: ( p_CatchClause )+
             var cnt87=0;
             loop87:
             do {
@@ -10956,13 +10961,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt87) {
                 case 1 :
-                    // xquery/XQueryParser.g:769:23: p_CatchClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5374);
-                    p_CatchClause193=this.p_CatchClause();
+                    // xquery/XQueryParser.g:771:23: p_CatchClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchClause_in_p_TryCatchExpr5378);
+                    p_CatchClause192=this.p_CatchClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause193.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchClause192.getTree());
 
 
                     break;
@@ -11014,7 +11019,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:773:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
+    // xquery/XQueryParser.g:775:1: p_TryClause : k= TRY LBRACKET p_TryTargetExpr RBRACKET ;
     // $ANTLR start "p_TryClause"
     p_TryClause: function() {
         var retval = new XQueryParser.p_TryClause_return();
@@ -11023,20 +11028,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET194 = null;
-        var RBRACKET196 = null;
-         var p_TryTargetExpr195 = null;
+        var LBRACKET193 = null;
+        var RBRACKET195 = null;
+         var p_TryTargetExpr194 = null;
 
         var k_tree=null;
-        var LBRACKET194_tree=null;
-        var RBRACKET196_tree=null;
+        var LBRACKET193_tree=null;
+        var RBRACKET195_tree=null;
 
         try {
-            // xquery/XQueryParser.g:774:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
-            // xquery/XQueryParser.g:774:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
+            // xquery/XQueryParser.g:776:9: (k= TRY LBRACKET p_TryTargetExpr RBRACKET )
+            // xquery/XQueryParser.g:776:11: k= TRY LBRACKET p_TryTargetExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5403); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryClause5407); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -11044,21 +11049,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET194=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5407); if (this.state.failed) return retval;
+            LBRACKET193=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET194_tree = this.adaptor.create(LBRACKET194);
-            this.adaptor.addChild(root_0, LBRACKET194_tree);
+            LBRACKET193_tree = this.adaptor.create(LBRACKET193);
+            this.adaptor.addChild(root_0, LBRACKET193_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5409);
-            p_TryTargetExpr195=this.p_TryTargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TryTargetExpr_in_p_TryClause5413);
+            p_TryTargetExpr194=this.p_TryTargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr195.getTree());
-            RBRACKET196=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5411); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TryTargetExpr194.getTree());
+            RBRACKET195=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_TryClause5415); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET196_tree = this.adaptor.create(RBRACKET196);
-            this.adaptor.addChild(root_0, RBRACKET196_tree);
+            RBRACKET195_tree = this.adaptor.create(RBRACKET195);
+            this.adaptor.addChild(root_0, RBRACKET195_tree);
             }
 
 
@@ -11096,7 +11101,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:778:1: p_TryTargetExpr : p_Expr[false,false] ;
+    // xquery/XQueryParser.g:780:1: p_TryTargetExpr : p_Expr[false,false] ;
     // $ANTLR start "p_TryTargetExpr"
     p_TryTargetExpr: function() {
         var retval = new XQueryParser.p_TryTargetExpr_return();
@@ -11104,20 +11109,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr197 = null;
+         var p_Expr196 = null;
 
 
         try {
-            // xquery/XQueryParser.g:779:9: ( p_Expr[false,false] )
-            // xquery/XQueryParser.g:779:11: p_Expr[false,false]
+            // xquery/XQueryParser.g:781:9: ( p_Expr[false,false] )
+            // xquery/XQueryParser.g:781:11: p_Expr[false,false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5437);
-            p_Expr197=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TryTargetExpr5441);
+            p_Expr196=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr197.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr196.getTree());
 
 
 
@@ -11154,7 +11159,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:783:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
+    // xquery/XQueryParser.g:785:1: p_CatchClause : k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET ;
     // $ANTLR start "p_CatchClause"
     p_CatchClause: function() {
         var retval = new XQueryParser.p_CatchClause_return();
@@ -11163,21 +11168,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET199 = null;
-        var RBRACKET201 = null;
-         var p_CatchErrorList198 = null;
-         var p_Expr200 = null;
+        var LBRACKET198 = null;
+        var RBRACKET200 = null;
+         var p_CatchErrorList197 = null;
+         var p_Expr199 = null;
 
         var k_tree=null;
-        var LBRACKET199_tree=null;
-        var RBRACKET201_tree=null;
+        var LBRACKET198_tree=null;
+        var RBRACKET200_tree=null;
 
         try {
-            // xquery/XQueryParser.g:784:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
-            // xquery/XQueryParser.g:784:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
+            // xquery/XQueryParser.g:786:9: (k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET )
+            // xquery/XQueryParser.g:786:11: k= CATCH p_CatchErrorList LBRACKET p_Expr[false,false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5466); if (this.state.failed) return retval;
+            k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_CatchClause5470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -11185,27 +11190,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5470);
-            p_CatchErrorList198=this.p_CatchErrorList();
+            this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_CatchClause5474);
+            p_CatchErrorList197=this.p_CatchErrorList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList198.getTree());
-            LBRACKET199=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5472); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList197.getTree());
+            LBRACKET198=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CatchClause5476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET199_tree = this.adaptor.create(LBRACKET199);
-            this.adaptor.addChild(root_0, LBRACKET199_tree);
+            LBRACKET198_tree = this.adaptor.create(LBRACKET198);
+            this.adaptor.addChild(root_0, LBRACKET198_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5474);
-            p_Expr200=this.p_Expr(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CatchClause5478);
+            p_Expr199=this.p_Expr(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr200.getTree());
-            RBRACKET201=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5477); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr199.getTree());
+            RBRACKET200=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CatchClause5481); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET201_tree = this.adaptor.create(RBRACKET201);
-            this.adaptor.addChild(root_0, RBRACKET201_tree);
+            RBRACKET200_tree = this.adaptor.create(RBRACKET200);
+            this.adaptor.addChild(root_0, RBRACKET200_tree);
             }
 
 
@@ -11243,7 +11248,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:788:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
+    // xquery/XQueryParser.g:790:1: p_CatchErrorList : ( p_NameTest ( VBAR p_NameTest )* | {...}? => () );
     // $ANTLR start "p_CatchErrorList"
     p_CatchErrorList: function() {
         var retval = new XQueryParser.p_CatchErrorList_return();
@@ -11251,14 +11256,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var VBAR203 = null;
-         var p_NameTest202 = null;
-         var p_NameTest204 = null;
+        var VBAR202 = null;
+         var p_NameTest201 = null;
+         var p_NameTest203 = null;
 
-        var VBAR203_tree=null;
+        var VBAR202_tree=null;
 
         try {
-            // xquery/XQueryParser.g:789:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
+            // xquery/XQueryParser.g:791:9: ( p_NameTest ( VBAR p_NameTest )* | {...}? => () )
             var alt89=2;
             var LA89_0 = this.input.LA(1);
 
@@ -11277,16 +11282,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt89) {
                 case 1 :
-                    // xquery/XQueryParser.g:789:11: p_NameTest ( VBAR p_NameTest )*
+                    // xquery/XQueryParser.g:791:11: p_NameTest ( VBAR p_NameTest )*
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5503);
-                    p_NameTest202=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5507);
+                    p_NameTest201=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest202.getTree());
-                    // xquery/XQueryParser.g:789:22: ( VBAR p_NameTest )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest201.getTree());
+                    // xquery/XQueryParser.g:791:22: ( VBAR p_NameTest )*
                     loop88:
                     do {
                         var alt88=2;
@@ -11299,18 +11304,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt88) {
                         case 1 :
-                            // xquery/XQueryParser.g:789:23: VBAR p_NameTest
-                            VBAR203=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5506); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:791:23: VBAR p_NameTest
+                            VBAR202=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_CatchErrorList5510); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR203_tree = this.adaptor.create(VBAR203);
-                            this.adaptor.addChild(root_0, VBAR203_tree);
+                            VBAR202_tree = this.adaptor.create(VBAR202);
+                            this.adaptor.addChild(root_0, VBAR202_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5508);
-                            p_NameTest204=this.p_NameTest();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_CatchErrorList5512);
+                            p_NameTest203=this.p_NameTest();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest204.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest203.getTree());
 
 
                             break;
@@ -11324,15 +11329,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:790:11: {...}? => ()
+                    // xquery/XQueryParser.g:792:11: {...}? => ()
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_CatchErrorList", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:790:29: ()
-                    // xquery/XQueryParser.g:790:43: 
+                    // xquery/XQueryParser.g:792:29: ()
+                    // xquery/XQueryParser.g:792:43: 
 
 
 
@@ -11373,7 +11378,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:794:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
+    // xquery/XQueryParser.g:796:1: p_OrExpr : p_AndExpr (k= OR p_AndExpr )* ;
     // $ANTLR start "p_OrExpr"
     p_OrExpr: function() {
         var retval = new XQueryParser.p_OrExpr_return();
@@ -11382,23 +11387,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AndExpr204 = null;
          var p_AndExpr205 = null;
-         var p_AndExpr206 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:795:9: ( p_AndExpr (k= OR p_AndExpr )* )
-            // xquery/XQueryParser.g:795:11: p_AndExpr (k= OR p_AndExpr )*
+            // xquery/XQueryParser.g:797:9: ( p_AndExpr (k= OR p_AndExpr )* )
+            // xquery/XQueryParser.g:797:11: p_AndExpr (k= OR p_AndExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5553);
-            p_AndExpr205=this.p_AndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5557);
+            p_AndExpr204=this.p_AndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
-            // xquery/XQueryParser.g:795:21: (k= OR p_AndExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr204.getTree());
+            // xquery/XQueryParser.g:797:21: (k= OR p_AndExpr )*
             loop90:
             do {
                 var alt90=2;
@@ -11411,8 +11416,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt90) {
                 case 1 :
-                    // xquery/XQueryParser.g:795:23: k= OR p_AndExpr
-                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5559); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:797:23: k= OR p_AndExpr
+                    k=this.match(this.input,OR,XQueryParser.FOLLOW_OR_in_p_OrExpr5563); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -11420,12 +11425,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5563);
-                    p_AndExpr206=this.p_AndExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AndExpr_in_p_OrExpr5567);
+                    p_AndExpr205=this.p_AndExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr206.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AndExpr205.getTree());
 
 
                     break;
@@ -11471,7 +11476,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:799:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
+    // xquery/XQueryParser.g:801:1: p_AndExpr : p_ComparisonExpr (k= AND p_ComparisonExpr )* ;
     // $ANTLR start "p_AndExpr"
     p_AndExpr: function() {
         var retval = new XQueryParser.p_AndExpr_return();
@@ -11480,23 +11485,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_ComparisonExpr206 = null;
          var p_ComparisonExpr207 = null;
-         var p_ComparisonExpr208 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:800:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
-            // xquery/XQueryParser.g:800:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
+            // xquery/XQueryParser.g:802:9: ( p_ComparisonExpr (k= AND p_ComparisonExpr )* )
+            // xquery/XQueryParser.g:802:11: p_ComparisonExpr (k= AND p_ComparisonExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5592);
-            p_ComparisonExpr207=this.p_ComparisonExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5596);
+            p_ComparisonExpr206=this.p_ComparisonExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
-            // xquery/XQueryParser.g:800:28: (k= AND p_ComparisonExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr206.getTree());
+            // xquery/XQueryParser.g:802:28: (k= AND p_ComparisonExpr )*
             loop91:
             do {
                 var alt91=2;
@@ -11509,8 +11514,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt91) {
                 case 1 :
-                    // xquery/XQueryParser.g:800:30: k= AND p_ComparisonExpr
-                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5598); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:802:30: k= AND p_ComparisonExpr
+                    k=this.match(this.input,AND,XQueryParser.FOLLOW_AND_in_p_AndExpr5602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -11518,12 +11523,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5602);
-                    p_ComparisonExpr208=this.p_ComparisonExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComparisonExpr_in_p_AndExpr5606);
+                    p_ComparisonExpr207=this.p_ComparisonExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr208.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComparisonExpr207.getTree());
 
 
                     break;
@@ -11569,7 +11574,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:805:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
+    // xquery/XQueryParser.g:807:1: p_ComparisonExpr : p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? ;
     // $ANTLR start "p_ComparisonExpr"
     p_ComparisonExpr: function() {
         var retval = new XQueryParser.p_ComparisonExpr_return();
@@ -11577,25 +11582,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTContainsExpr209 = null;
-         var p_ValueComp210 = null;
-         var p_GeneralComp211 = null;
-         var p_NodeComp212 = null;
-         var p_FTContainsExpr213 = null;
+         var p_FTContainsExpr208 = null;
+         var p_ValueComp209 = null;
+         var p_GeneralComp210 = null;
+         var p_NodeComp211 = null;
+         var p_FTContainsExpr212 = null;
 
 
         try {
-            // xquery/XQueryParser.g:806:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
-            // xquery/XQueryParser.g:806:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            // xquery/XQueryParser.g:808:9: ( p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )? )
+            // xquery/XQueryParser.g:808:11: p_FTContainsExpr ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632);
-            p_FTContainsExpr209=this.p_FTContainsExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636);
+            p_FTContainsExpr208=this.p_FTContainsExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr209.getTree());
-            // xquery/XQueryParser.g:806:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr208.getTree());
+            // xquery/XQueryParser.g:808:28: ( ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr )?
             var alt93=2;
             var LA93_0 = this.input.LA(1);
 
@@ -11604,8 +11609,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt93) {
                 case 1 :
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
-                    // xquery/XQueryParser.g:806:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp ) p_FTContainsExpr
+                    // xquery/XQueryParser.g:808:30: ( p_ValueComp | p_GeneralComp | p_NodeComp )
                     var alt92=3;
                     switch ( this.input.LA(1) ) {
                     case EQ:
@@ -11639,47 +11644,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     switch (alt92) {
                         case 1 :
-                            // xquery/XQueryParser.g:806:31: p_ValueComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5637);
-                            p_ValueComp210=this.p_ValueComp();
+                            // xquery/XQueryParser.g:808:31: p_ValueComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_ValueComp_in_p_ComparisonExpr5641);
+                            p_ValueComp209=this.p_ValueComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp210.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValueComp209.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:806:45: p_GeneralComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641);
-                            p_GeneralComp211=this.p_GeneralComp();
+                            // xquery/XQueryParser.g:808:45: p_GeneralComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645);
+                            p_GeneralComp210=this.p_GeneralComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp211.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_GeneralComp210.getTree());
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:806:61: p_NodeComp
-                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5645);
-                            p_NodeComp212=this.p_NodeComp();
+                            // xquery/XQueryParser.g:808:61: p_NodeComp
+                            this.pushFollow(XQueryParser.FOLLOW_p_NodeComp_in_p_ComparisonExpr5649);
+                            p_NodeComp211=this.p_NodeComp();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp212.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeComp211.getTree());
 
 
                             break;
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648);
-                    p_FTContainsExpr213=this.p_FTContainsExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652);
+                    p_FTContainsExpr212=this.p_FTContainsExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr213.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContainsExpr212.getTree());
 
 
                     break;
@@ -11722,7 +11727,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:810:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
+    // xquery/XQueryParser.g:812:1: p_RangeExpr : p_AdditiveExpr (k= TO p_AdditiveExpr )? ;
     // $ANTLR start "p_RangeExpr"
     p_RangeExpr: function() {
         var retval = new XQueryParser.p_RangeExpr_return();
@@ -11731,23 +11736,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_AdditiveExpr213 = null;
          var p_AdditiveExpr214 = null;
-         var p_AdditiveExpr215 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:811:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
-            // xquery/XQueryParser.g:811:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
+            // xquery/XQueryParser.g:813:9: ( p_AdditiveExpr (k= TO p_AdditiveExpr )? )
+            // xquery/XQueryParser.g:813:11: p_AdditiveExpr (k= TO p_AdditiveExpr )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677);
-            p_AdditiveExpr214=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681);
+            p_AdditiveExpr213=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
-            // xquery/XQueryParser.g:811:26: (k= TO p_AdditiveExpr )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr213.getTree());
+            // xquery/XQueryParser.g:813:26: (k= TO p_AdditiveExpr )?
             var alt94=2;
             var LA94_0 = this.input.LA(1);
 
@@ -11756,8 +11761,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt94) {
                 case 1 :
-                    // xquery/XQueryParser.g:811:28: k= TO p_AdditiveExpr
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5683); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:813:28: k= TO p_AdditiveExpr
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_RangeExpr5687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -11765,12 +11770,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687);
-                    p_AdditiveExpr215=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691);
+                    p_AdditiveExpr214=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr215.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr214.getTree());
 
 
                     break;
@@ -11813,7 +11818,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:815:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
+    // xquery/XQueryParser.g:817:1: p_AdditiveExpr : p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* ;
     // $ANTLR start "p_AdditiveExpr"
     p_AdditiveExpr: function() {
         var retval = new XQueryParser.p_AdditiveExpr_return();
@@ -11822,23 +11827,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
+         var p_MultiplicativeExpr215 = null;
          var p_MultiplicativeExpr216 = null;
-         var p_MultiplicativeExpr217 = null;
 
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:816:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
-            // xquery/XQueryParser.g:816:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            // xquery/XQueryParser.g:818:9: ( p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )* )
+            // xquery/XQueryParser.g:818:11: p_MultiplicativeExpr ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716);
-            p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720);
+            p_MultiplicativeExpr215=this.p_MultiplicativeExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
-            // xquery/XQueryParser.g:816:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr215.getTree());
+            // xquery/XQueryParser.g:818:32: ( (o= PLUS | o= MINUS ) p_MultiplicativeExpr )*
             loop96:
             do {
                 var alt96=2;
@@ -11851,8 +11856,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt96) {
                 case 1 :
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
-                    // xquery/XQueryParser.g:816:34: (o= PLUS | o= MINUS )
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS ) p_MultiplicativeExpr
+                    // xquery/XQueryParser.g:818:34: (o= PLUS | o= MINUS )
                     var alt95=2;
                     var LA95_0 = this.input.LA(1);
 
@@ -11871,8 +11876,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt95) {
                         case 1 :
-                            // xquery/XQueryParser.g:816:35: o= PLUS
-                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5723); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:35: o= PLUS
+                            o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_AdditiveExpr5727); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -11884,8 +11889,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:816:59: o= MINUS
-                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5731); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:818:59: o= MINUS
+                            o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_AdditiveExpr5735); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -11899,12 +11904,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736);
-                    p_MultiplicativeExpr217=this.p_MultiplicativeExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740);
+                    p_MultiplicativeExpr216=this.p_MultiplicativeExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr217.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_MultiplicativeExpr216.getTree());
 
 
                     break;
@@ -11950,7 +11955,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:820:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
+    // xquery/XQueryParser.g:822:1: p_MultiplicativeExpr : p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* ;
     // $ANTLR start "p_MultiplicativeExpr"
     p_MultiplicativeExpr: function() {
         var retval = new XQueryParser.p_MultiplicativeExpr_return();
@@ -11960,24 +11965,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var o = null;
         var k = null;
+         var p_UnionExpr217 = null;
          var p_UnionExpr218 = null;
-         var p_UnionExpr219 = null;
 
         var o_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:821:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
-            // xquery/XQueryParser.g:821:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            // xquery/XQueryParser.g:823:9: ( p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )* )
+            // xquery/XQueryParser.g:823:11: p_UnionExpr ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765);
-            p_UnionExpr218=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769);
+            p_UnionExpr217=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
-            // xquery/XQueryParser.g:821:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr217.getTree());
+            // xquery/XQueryParser.g:823:23: ( (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr )*
             loop99:
             do {
                 var alt99=2;
@@ -11990,8 +11995,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt99) {
                 case 1 :
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
-                    // xquery/XQueryParser.g:821:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) ) p_UnionExpr
+                    // xquery/XQueryParser.g:823:25: (o= STAR | (k= DIV | k= IDIV | k= MOD ) )
                     var alt98=2;
                     var LA98_0 = this.input.LA(1);
 
@@ -12010,8 +12015,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt98) {
                         case 1 :
-                            // xquery/XQueryParser.g:821:26: o= STAR
-                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5772); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:823:26: o= STAR
+                            o=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_MultiplicativeExpr5776); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             o_tree = this.adaptor.create(o);
                             this.adaptor.addChild(root_0, o_tree);
@@ -12023,8 +12028,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
-                            // xquery/XQueryParser.g:821:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
+                            // xquery/XQueryParser.g:823:50: (k= DIV | k= IDIV | k= MOD )
                             var alt97=3;
                             switch ( this.input.LA(1) ) {
                             case DIV:
@@ -12046,8 +12051,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             switch (alt97) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:821:51: k= DIV
-                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5781); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:51: k= DIV
+                                    k=this.match(this.input,DIV,XQueryParser.FOLLOW_DIV_in_p_MultiplicativeExpr5785); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -12056,8 +12061,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:821:59: k= IDIV
-                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5787); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:59: k= IDIV
+                                    k=this.match(this.input,IDIV,XQueryParser.FOLLOW_IDIV_in_p_MultiplicativeExpr5791); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -12066,8 +12071,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 3 :
-                                    // xquery/XQueryParser.g:821:68: k= MOD
-                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5793); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:823:68: k= MOD
+                                    k=this.match(this.input,MOD,XQueryParser.FOLLOW_MOD_in_p_MultiplicativeExpr5797); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -12087,12 +12092,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799);
-                    p_UnionExpr219=this.p_UnionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803);
+                    p_UnionExpr218=this.p_UnionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr219.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr218.getTree());
 
 
                     break;
@@ -12138,7 +12143,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:825:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
+    // xquery/XQueryParser.g:827:1: p_UnionExpr : p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* ;
     // $ANTLR start "p_UnionExpr"
     p_UnionExpr: function() {
         var retval = new XQueryParser.p_UnionExpr_return();
@@ -12147,25 +12152,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var VBAR221 = null;
-         var p_IntersectExceptExpr220 = null;
-         var p_IntersectExceptExpr222 = null;
+        var VBAR220 = null;
+         var p_IntersectExceptExpr219 = null;
+         var p_IntersectExceptExpr221 = null;
 
         var k_tree=null;
-        var VBAR221_tree=null;
+        var VBAR220_tree=null;
 
         try {
-            // xquery/XQueryParser.g:826:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
-            // xquery/XQueryParser.g:826:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            // xquery/XQueryParser.g:828:9: ( p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )* )
+            // xquery/XQueryParser.g:828:11: p_IntersectExceptExpr ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828);
-            p_IntersectExceptExpr220=this.p_IntersectExceptExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832);
+            p_IntersectExceptExpr219=this.p_IntersectExceptExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr220.getTree());
-            // xquery/XQueryParser.g:826:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr219.getTree());
+            // xquery/XQueryParser.g:828:33: ( (k= UNION | VBAR ) p_IntersectExceptExpr )*
             loop101:
             do {
                 var alt101=2;
@@ -12178,8 +12183,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt101) {
                 case 1 :
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR ) p_IntersectExceptExpr
-                    // xquery/XQueryParser.g:826:35: (k= UNION | VBAR )
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR ) p_IntersectExceptExpr
+                    // xquery/XQueryParser.g:828:35: (k= UNION | VBAR )
                     var alt100=2;
                     var LA100_0 = this.input.LA(1);
 
@@ -12198,8 +12203,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt100) {
                         case 1 :
-                            // xquery/XQueryParser.g:826:36: k= UNION
-                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5835); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:36: k= UNION
+                            k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_UnionExpr5839); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -12211,11 +12216,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:826:61: VBAR
-                            VBAR221=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5841); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:828:61: VBAR
+                            VBAR220=this.match(this.input,VBAR,XQueryParser.FOLLOW_VBAR_in_p_UnionExpr5845); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            VBAR221_tree = this.adaptor.create(VBAR221);
-                            this.adaptor.addChild(root_0, VBAR221_tree);
+                            VBAR220_tree = this.adaptor.create(VBAR220);
+                            this.adaptor.addChild(root_0, VBAR220_tree);
                             }
 
 
@@ -12223,12 +12228,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844);
-                    p_IntersectExceptExpr222=this.p_IntersectExceptExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848);
+                    p_IntersectExceptExpr221=this.p_IntersectExceptExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr222.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntersectExceptExpr221.getTree());
 
 
                     break;
@@ -12274,7 +12279,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:830:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
+    // xquery/XQueryParser.g:832:1: p_IntersectExceptExpr : p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* ;
     // $ANTLR start "p_IntersectExceptExpr"
     p_IntersectExceptExpr: function() {
         var retval = new XQueryParser.p_IntersectExceptExpr_return();
@@ -12283,23 +12288,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
+         var p_InstanceofExpr222 = null;
          var p_InstanceofExpr223 = null;
-         var p_InstanceofExpr224 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:831:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
-            // xquery/XQueryParser.g:831:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            // xquery/XQueryParser.g:833:9: ( p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )* )
+            // xquery/XQueryParser.g:833:11: p_InstanceofExpr ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873);
-            p_InstanceofExpr223=this.p_InstanceofExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877);
+            p_InstanceofExpr222=this.p_InstanceofExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
-            // xquery/XQueryParser.g:831:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr222.getTree());
+            // xquery/XQueryParser.g:833:28: ( (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr )*
             loop103:
             do {
                 var alt103=2;
@@ -12312,8 +12317,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt103) {
                 case 1 :
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
-                    // xquery/XQueryParser.g:831:30: (k= INTERSECT | k= EXCEPT )
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT ) p_InstanceofExpr
+                    // xquery/XQueryParser.g:833:30: (k= INTERSECT | k= EXCEPT )
                     var alt102=2;
                     var LA102_0 = this.input.LA(1);
 
@@ -12332,8 +12337,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt102) {
                         case 1 :
-                            // xquery/XQueryParser.g:831:31: k= INTERSECT
-                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:31: k= INTERSECT
+                            k=this.match(this.input,INTERSECT,XQueryParser.FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -12342,8 +12347,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:831:45: k= EXCEPT
-                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:833:45: k= EXCEPT
+                            k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -12357,12 +12362,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891);
-                    p_InstanceofExpr224=this.p_InstanceofExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895);
+                    p_InstanceofExpr223=this.p_InstanceofExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr224.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InstanceofExpr223.getTree());
 
 
                     break;
@@ -12408,7 +12413,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:835:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
+    // xquery/XQueryParser.g:837:1: p_InstanceofExpr : p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? ;
     // $ANTLR start "p_InstanceofExpr"
     p_InstanceofExpr: function() {
         var retval = new XQueryParser.p_InstanceofExpr_return();
@@ -12417,23 +12422,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_TreatExpr225 = null;
-         var p_SequenceType226 = null;
+         var p_TreatExpr224 = null;
+         var p_SequenceType225 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:836:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
-            // xquery/XQueryParser.g:836:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
+            // xquery/XQueryParser.g:838:9: ( p_TreatExpr (k= INSTANCE k= OF p_SequenceType )? )
+            // xquery/XQueryParser.g:838:11: p_TreatExpr (k= INSTANCE k= OF p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920);
-            p_TreatExpr225=this.p_TreatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924);
+            p_TreatExpr224=this.p_TreatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr225.getTree());
-            // xquery/XQueryParser.g:836:23: (k= INSTANCE k= OF p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TreatExpr224.getTree());
+            // xquery/XQueryParser.g:838:23: (k= INSTANCE k= OF p_SequenceType )?
             var alt104=2;
             var LA104_0 = this.input.LA(1);
 
@@ -12442,8 +12447,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt104) {
                 case 1 :
-                    // xquery/XQueryParser.g:836:25: k= INSTANCE k= OF p_SequenceType
-                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:838:25: k= INSTANCE k= OF p_SequenceType
+                    k=this.match(this.input,INSTANCE,XQueryParser.FOLLOW_INSTANCE_in_p_InstanceofExpr5930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12451,7 +12456,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5932); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_InstanceofExpr5936); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12459,12 +12464,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5936);
-                    p_SequenceType226=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_InstanceofExpr5940);
+                    p_SequenceType225=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType226.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType225.getTree());
 
 
                     break;
@@ -12507,7 +12512,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:840:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
+    // xquery/XQueryParser.g:842:1: p_TreatExpr : p_CastableExpr (k= TREAT k= AS p_SequenceType )? ;
     // $ANTLR start "p_TreatExpr"
     p_TreatExpr: function() {
         var retval = new XQueryParser.p_TreatExpr_return();
@@ -12516,23 +12521,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastableExpr227 = null;
-         var p_SequenceType228 = null;
+         var p_CastableExpr226 = null;
+         var p_SequenceType227 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:841:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
-            // xquery/XQueryParser.g:841:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
+            // xquery/XQueryParser.g:843:9: ( p_CastableExpr (k= TREAT k= AS p_SequenceType )? )
+            // xquery/XQueryParser.g:843:11: p_CastableExpr (k= TREAT k= AS p_SequenceType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5964);
-            p_CastableExpr227=this.p_CastableExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastableExpr_in_p_TreatExpr5968);
+            p_CastableExpr226=this.p_CastableExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr227.getTree());
-            // xquery/XQueryParser.g:841:26: (k= TREAT k= AS p_SequenceType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastableExpr226.getTree());
+            // xquery/XQueryParser.g:843:26: (k= TREAT k= AS p_SequenceType )?
             var alt105=2;
             var LA105_0 = this.input.LA(1);
 
@@ -12541,8 +12546,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt105) {
                 case 1 :
-                    // xquery/XQueryParser.g:841:28: k= TREAT k= AS p_SequenceType
-                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5970); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:843:28: k= TREAT k= AS p_SequenceType
+                    k=this.match(this.input,TREAT,XQueryParser.FOLLOW_TREAT_in_p_TreatExpr5974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12550,7 +12555,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5976); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TreatExpr5980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12558,12 +12563,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5980);
-                    p_SequenceType228=this.p_SequenceType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TreatExpr5984);
+                    p_SequenceType227=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType228.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType227.getTree());
 
 
                     break;
@@ -12606,7 +12611,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:845:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:847:1: p_CastableExpr : p_CastExpr (k= CASTABLE k= AS p_SingleType )? ;
     // $ANTLR start "p_CastableExpr"
     p_CastableExpr: function() {
         var retval = new XQueryParser.p_CastableExpr_return();
@@ -12615,23 +12620,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_CastExpr229 = null;
-         var p_SingleType230 = null;
+         var p_CastExpr228 = null;
+         var p_SingleType229 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:846:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:846:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
+            // xquery/XQueryParser.g:848:9: ( p_CastExpr (k= CASTABLE k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:848:11: p_CastExpr (k= CASTABLE k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6017);
-            p_CastExpr229=this.p_CastExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_CastExpr_in_p_CastableExpr6021);
+            p_CastExpr228=this.p_CastExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr229.getTree());
-            // xquery/XQueryParser.g:846:22: (k= CASTABLE k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CastExpr228.getTree());
+            // xquery/XQueryParser.g:848:22: (k= CASTABLE k= AS p_SingleType )?
             var alt106=2;
             var LA106_0 = this.input.LA(1);
 
@@ -12640,8 +12645,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt106) {
                 case 1 :
-                    // xquery/XQueryParser.g:846:24: k= CASTABLE k= AS p_SingleType
-                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6023); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:848:24: k= CASTABLE k= AS p_SingleType
+                    k=this.match(this.input,CASTABLE,XQueryParser.FOLLOW_CASTABLE_in_p_CastableExpr6027); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12649,7 +12654,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6029); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastableExpr6033); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12657,12 +12662,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6033);
-                    p_SingleType230=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastableExpr6037);
+                    p_SingleType229=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType230.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType229.getTree());
 
 
                     break;
@@ -12705,7 +12710,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:850:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
+    // xquery/XQueryParser.g:852:1: p_CastExpr : p_UnaryExpr (k= CAST k= AS p_SingleType )? ;
     // $ANTLR start "p_CastExpr"
     p_CastExpr: function() {
         var retval = new XQueryParser.p_CastExpr_return();
@@ -12714,23 +12719,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_UnaryExpr231 = null;
-         var p_SingleType232 = null;
+         var p_UnaryExpr230 = null;
+         var p_SingleType231 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:851:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
-            // xquery/XQueryParser.g:851:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
+            // xquery/XQueryParser.g:853:9: ( p_UnaryExpr (k= CAST k= AS p_SingleType )? )
+            // xquery/XQueryParser.g:853:11: p_UnaryExpr (k= CAST k= AS p_SingleType )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6070);
-            p_UnaryExpr231=this.p_UnaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnaryExpr_in_p_CastExpr6074);
+            p_UnaryExpr230=this.p_UnaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr231.getTree());
-            // xquery/XQueryParser.g:851:23: (k= CAST k= AS p_SingleType )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnaryExpr230.getTree());
+            // xquery/XQueryParser.g:853:23: (k= CAST k= AS p_SingleType )?
             var alt107=2;
             var LA107_0 = this.input.LA(1);
 
@@ -12739,8 +12744,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt107) {
                 case 1 :
-                    // xquery/XQueryParser.g:851:25: k= CAST k= AS p_SingleType
-                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6076); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:853:25: k= CAST k= AS p_SingleType
+                    k=this.match(this.input,CAST,XQueryParser.FOLLOW_CAST_in_p_CastExpr6080); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12748,7 +12753,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6082); if (this.state.failed) return retval;
+                    k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CastExpr6086); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -12756,12 +12761,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6086);
-                    p_SingleType232=this.p_SingleType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SingleType_in_p_CastExpr6090);
+                    p_SingleType231=this.p_SingleType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType232.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SingleType231.getTree());
 
 
                     break;
@@ -12804,7 +12809,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:855:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
+    // xquery/XQueryParser.g:857:1: p_UnaryExpr : (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) ;
     // $ANTLR start "p_UnaryExpr"
     p_UnaryExpr: function() {
         var retval = new XQueryParser.p_UnaryExpr_return();
@@ -12813,16 +12818,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var o = null;
-         var p_ValueExpr233 = null;
+         var p_ValueExpr232 = null;
 
         var o_tree=null;
         var stream_PLUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token PLUS");
         var stream_MINUS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token MINUS");
         var stream_p_ValueExpr=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ValueExpr");
         try {
-            // xquery/XQueryParser.g:856:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )* p_ValueExpr
-            // xquery/XQueryParser.g:856:11: (o= PLUS | o= MINUS )*
+            // xquery/XQueryParser.g:858:9: ( (o= PLUS | o= MINUS )* p_ValueExpr -> ^( UnaryExpr ( PLUS )* p_ValueExpr ) )
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )* p_ValueExpr
+            // xquery/XQueryParser.g:858:11: (o= PLUS | o= MINUS )*
             loop108:
             do {
                 var alt108=3;
@@ -12838,8 +12843,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt108) {
                 case 1 :
-                    // xquery/XQueryParser.g:856:12: o= PLUS
-                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6118); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:12: o= PLUS
+                    o=this.match(this.input,PLUS,XQueryParser.FOLLOW_PLUS_in_p_UnaryExpr6122); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_PLUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -12849,8 +12854,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:856:36: o= MINUS
-                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6126); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:858:36: o= MINUS
+                    o=this.match(this.input,MINUS,XQueryParser.FOLLOW_MINUS_in_p_UnaryExpr6130); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_MINUS.add(o);
 
                     if ( this.state.backtracking===0 ) {
@@ -12865,12 +12870,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6131);
-            p_ValueExpr233=this.p_ValueExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_ValueExpr_in_p_UnaryExpr6135);
+            p_ValueExpr232=this.p_ValueExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr233.getTree());
+            if ( this.state.backtracking===0 ) stream_p_ValueExpr.add(p_ValueExpr232.getTree());
 
 
             // AST REWRITE
@@ -12884,14 +12889,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 857:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
+            // 859:17: -> ^( UnaryExpr ( PLUS )* p_ValueExpr )
             {
-                // xquery/XQueryParser.g:857:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
+                // xquery/XQueryParser.g:859:20: ^( UnaryExpr ( PLUS )* p_ValueExpr )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(UnaryExpr, "UnaryExpr"), root_1);
 
-                // xquery/XQueryParser.g:857:32: ( PLUS )*
+                // xquery/XQueryParser.g:859:32: ( PLUS )*
                 while ( stream_PLUS.hasNext() ) {
                     this.adaptor.addChild(root_1, stream_PLUS.nextNode());
 
@@ -12940,7 +12945,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:861:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
+    // xquery/XQueryParser.g:863:1: p_ValueExpr : ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr );
     // $ANTLR start "p_ValueExpr"
     p_ValueExpr: function() {
         var retval = new XQueryParser.p_ValueExpr_return();
@@ -12948,13 +12953,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ValidateExpr234 = null;
-         var p_PathExpr235 = null;
-         var p_ExtensionExpr236 = null;
+         var p_ValidateExpr233 = null;
+         var p_PathExpr234 = null;
+         var p_ExtensionExpr235 = null;
 
 
         try {
-            // xquery/XQueryParser.g:862:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
+            // xquery/XQueryParser.g:864:9: ( ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr | p_PathExpr | p_ExtensionExpr )
             var alt109=3;
             switch ( this.input.LA(1) ) {
             case VALIDATE:
@@ -13220,41 +13225,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt109) {
                 case 1 :
-                    // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
+                    // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )=> p_ValidateExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6201);
-                    p_ValidateExpr234=this.p_ValidateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidateExpr_in_p_ValueExpr6205);
+                    p_ValidateExpr233=this.p_ValidateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr234.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidateExpr233.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:863:11: p_PathExpr
+                    // xquery/XQueryParser.g:865:11: p_PathExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6213);
-                    p_PathExpr235=this.p_PathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ValueExpr6217);
+                    p_PathExpr234=this.p_PathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr235.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr234.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:864:11: p_ExtensionExpr
+                    // xquery/XQueryParser.g:866:11: p_ExtensionExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225);
-                    p_ExtensionExpr236=this.p_ExtensionExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229);
+                    p_ExtensionExpr235=this.p_ExtensionExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr236.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExtensionExpr235.getTree());
 
 
                     break;
@@ -13293,7 +13298,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:868:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
+    // xquery/XQueryParser.g:870:1: p_GeneralComp : (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) ;
     // $ANTLR start "p_GeneralComp"
     p_GeneralComp: function() {
         var retval = new XQueryParser.p_GeneralComp_return();
@@ -13306,11 +13311,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var o_tree=null;
 
         try {
-            // xquery/XQueryParser.g:869:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:9: ( (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ ) )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:869:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
+            // xquery/XQueryParser.g:871:11: (o= EQUAL | o= NOTEQUAL | o= SMALLER | o= SMALLEREQ | o= GREATER | o= GREATEREQ )
             var alt110=6;
             switch ( this.input.LA(1) ) {
             case EQUAL:
@@ -13341,8 +13346,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt110) {
                 case 1 :
-                    // xquery/XQueryParser.g:869:12: o= EQUAL
-                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6254); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:12: o= EQUAL
+                    o=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_GeneralComp6258); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13351,8 +13356,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:869:22: o= NOTEQUAL
-                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6260); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:22: o= NOTEQUAL
+                    o=this.match(this.input,NOTEQUAL,XQueryParser.FOLLOW_NOTEQUAL_in_p_GeneralComp6264); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13361,8 +13366,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:869:35: o= SMALLER
-                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6266); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:35: o= SMALLER
+                    o=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_GeneralComp6270); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13371,8 +13376,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:869:47: o= SMALLEREQ
-                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6272); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:47: o= SMALLEREQ
+                    o=this.match(this.input,SMALLEREQ,XQueryParser.FOLLOW_SMALLEREQ_in_p_GeneralComp6276); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13381,8 +13386,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:869:61: o= GREATER
-                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6278); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:61: o= GREATER
+                    o=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_GeneralComp6282); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13391,8 +13396,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:869:73: o= GREATEREQ
-                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6284); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:871:73: o= GREATEREQ
+                    o=this.match(this.input,GREATEREQ,XQueryParser.FOLLOW_GREATEREQ_in_p_GeneralComp6288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     o_tree = this.adaptor.create(o);
                     this.adaptor.addChild(root_0, o_tree);
@@ -13442,7 +13447,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:873:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
+    // xquery/XQueryParser.g:875:1: p_ValueComp : (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) ;
     // $ANTLR start "p_ValueComp"
     p_ValueComp: function() {
         var retval = new XQueryParser.p_ValueComp_return();
@@ -13455,11 +13460,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:874:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:9: ( (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE ) )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:874:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
+            // xquery/XQueryParser.g:876:11: (k= EQ | k= NE | k= LT | k= LE | k= GT | k= GE )
             var alt111=6;
             switch ( this.input.LA(1) ) {
             case EQ:
@@ -13490,8 +13495,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt111) {
                 case 1 :
-                    // xquery/XQueryParser.g:874:12: k= EQ
-                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6316); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:12: k= EQ
+                    k=this.match(this.input,EQ,XQueryParser.FOLLOW_EQ_in_p_ValueComp6320); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13500,8 +13505,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:874:19: k= NE
-                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6322); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:19: k= NE
+                    k=this.match(this.input,NE,XQueryParser.FOLLOW_NE_in_p_ValueComp6326); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13510,8 +13515,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:874:26: k= LT
-                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6328); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:26: k= LT
+                    k=this.match(this.input,LT,XQueryParser.FOLLOW_LT_in_p_ValueComp6332); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13520,8 +13525,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:874:33: k= LE
-                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6334); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:33: k= LE
+                    k=this.match(this.input,LE,XQueryParser.FOLLOW_LE_in_p_ValueComp6338); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13530,8 +13535,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:874:40: k= GT
-                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6340); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:40: k= GT
+                    k=this.match(this.input,GT,XQueryParser.FOLLOW_GT_in_p_ValueComp6344); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13540,8 +13545,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:874:47: k= GE
-                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6346); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:876:47: k= GE
+                    k=this.match(this.input,GE,XQueryParser.FOLLOW_GE_in_p_ValueComp6350); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13591,7 +13596,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:878:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
+    // xquery/XQueryParser.g:880:1: p_NodeComp : (k= IS | SMALLER_SMALLER | GREATER_GREATER );
     // $ANTLR start "p_NodeComp"
     p_NodeComp: function() {
         var retval = new XQueryParser.p_NodeComp_return();
@@ -13600,15 +13605,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SMALLER_SMALLER237 = null;
-        var GREATER_GREATER238 = null;
+        var SMALLER_SMALLER236 = null;
+        var GREATER_GREATER237 = null;
 
         var k_tree=null;
-        var SMALLER_SMALLER237_tree=null;
-        var GREATER_GREATER238_tree=null;
+        var SMALLER_SMALLER236_tree=null;
+        var GREATER_GREATER237_tree=null;
 
         try {
-            // xquery/XQueryParser.g:879:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
+            // xquery/XQueryParser.g:881:9: (k= IS | SMALLER_SMALLER | GREATER_GREATER )
             var alt112=3;
             switch ( this.input.LA(1) ) {
             case IS:
@@ -13630,10 +13635,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt112) {
                 case 1 :
-                    // xquery/XQueryParser.g:879:11: k= IS
+                    // xquery/XQueryParser.g:881:11: k= IS
                     root_0 = this.adaptor.nil();
 
-                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6377); if (this.state.failed) return retval;
+                    k=this.match(this.input,IS,XQueryParser.FOLLOW_IS_in_p_NodeComp6381); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13645,25 +13650,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:879:33: SMALLER_SMALLER
+                    // xquery/XQueryParser.g:881:33: SMALLER_SMALLER
                     root_0 = this.adaptor.nil();
 
-                    SMALLER_SMALLER237=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383); if (this.state.failed) return retval;
+                    SMALLER_SMALLER236=this.match(this.input,SMALLER_SMALLER,XQueryParser.FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SMALLER_SMALLER237_tree = this.adaptor.create(SMALLER_SMALLER237);
-                    this.adaptor.addChild(root_0, SMALLER_SMALLER237_tree);
+                    SMALLER_SMALLER236_tree = this.adaptor.create(SMALLER_SMALLER236);
+                    this.adaptor.addChild(root_0, SMALLER_SMALLER236_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:879:51: GREATER_GREATER
+                    // xquery/XQueryParser.g:881:51: GREATER_GREATER
                     root_0 = this.adaptor.nil();
 
-                    GREATER_GREATER238=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6387); if (this.state.failed) return retval;
+                    GREATER_GREATER237=this.match(this.input,GREATER_GREATER,XQueryParser.FOLLOW_GREATER_GREATER_in_p_NodeComp6391); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    GREATER_GREATER238_tree = this.adaptor.create(GREATER_GREATER238);
-                    this.adaptor.addChild(root_0, GREATER_GREATER238_tree);
+                    GREATER_GREATER237_tree = this.adaptor.create(GREATER_GREATER237);
+                    this.adaptor.addChild(root_0, GREATER_GREATER237_tree);
                     }
 
 
@@ -13703,7 +13708,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:883:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:885:1: p_ValidateExpr : k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_ValidateExpr"
     p_ValidateExpr: function() {
         var retval = new XQueryParser.p_ValidateExpr_return();
@@ -13712,22 +13717,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET241 = null;
-        var RBRACKET243 = null;
-         var p_ValidationMode239 = null;
-         var p_TypeName240 = null;
-         var p_Expr242 = null;
+        var LBRACKET240 = null;
+        var RBRACKET242 = null;
+         var p_ValidationMode238 = null;
+         var p_TypeName239 = null;
+         var p_Expr241 = null;
 
         var k_tree=null;
-        var LBRACKET241_tree=null;
-        var RBRACKET243_tree=null;
+        var LBRACKET240_tree=null;
+        var RBRACKET242_tree=null;
 
         try {
-            // xquery/XQueryParser.g:884:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:884:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:886:9: (k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:886:11: k= VALIDATE ( p_ValidationMode | k= TYPE p_TypeName )? LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6415); if (this.state.failed) return retval;
+            k=this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_p_ValidateExpr6419); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -13735,7 +13740,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:884:37: ( p_ValidationMode | k= TYPE p_TypeName )?
+            // xquery/XQueryParser.g:886:37: ( p_ValidationMode | k= TYPE p_TypeName )?
             var alt113=3;
             var LA113_0 = this.input.LA(1);
 
@@ -13747,19 +13752,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt113) {
                 case 1 :
-                    // xquery/XQueryParser.g:884:39: p_ValidationMode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6421);
-                    p_ValidationMode239=this.p_ValidationMode();
+                    // xquery/XQueryParser.g:886:39: p_ValidationMode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_p_ValidateExpr6425);
+                    p_ValidationMode238=this.p_ValidationMode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode239.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ValidationMode238.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:884:58: k= TYPE p_TypeName
-                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6427); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:886:58: k= TYPE p_TypeName
+                    k=this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_p_ValidateExpr6431); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13767,33 +13772,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6431);
-                    p_TypeName240=this.p_TypeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ValidateExpr6435);
+                    p_TypeName239=this.p_TypeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName240.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName239.getTree());
 
 
                     break;
 
             }
 
-            LBRACKET241=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6436); if (this.state.failed) return retval;
+            LBRACKET240=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ValidateExpr6440); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET241_tree = this.adaptor.create(LBRACKET241);
-            this.adaptor.addChild(root_0, LBRACKET241_tree);
+            LBRACKET240_tree = this.adaptor.create(LBRACKET240);
+            this.adaptor.addChild(root_0, LBRACKET240_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6438);
-            p_Expr242=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ValidateExpr6442);
+            p_Expr241=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr242.getTree());
-            RBRACKET243=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6441); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr241.getTree());
+            RBRACKET242=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ValidateExpr6445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET243_tree = this.adaptor.create(RBRACKET243);
-            this.adaptor.addChild(root_0, RBRACKET243_tree);
+            RBRACKET242_tree = this.adaptor.create(RBRACKET242);
+            this.adaptor.addChild(root_0, RBRACKET242_tree);
             }
 
 
@@ -13831,7 +13836,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:888:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
+    // xquery/XQueryParser.g:890:1: p_ValidationMode : (k= LAX | k= STRICT ) ;
     // $ANTLR start "p_ValidationMode"
     p_ValidationMode: function() {
         var retval = new XQueryParser.p_ValidationMode_return();
@@ -13844,11 +13849,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:889:9: ( (k= LAX | k= STRICT ) )
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:9: ( (k= LAX | k= STRICT ) )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:889:11: (k= LAX | k= STRICT )
+            // xquery/XQueryParser.g:891:11: (k= LAX | k= STRICT )
             var alt114=2;
             var LA114_0 = this.input.LA(1);
 
@@ -13867,8 +13872,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt114) {
                 case 1 :
-                    // xquery/XQueryParser.g:889:12: k= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6470); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:12: k= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_p_ValidationMode6474); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13877,8 +13882,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:889:20: k= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6476); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:891:20: k= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_p_ValidationMode6480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -13928,7 +13933,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:893:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
+    // xquery/XQueryParser.g:895:1: p_ExtensionExpr : ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET ;
     // $ANTLR start "p_ExtensionExpr"
     p_ExtensionExpr: function() {
         var retval = new XQueryParser.p_ExtensionExpr_return();
@@ -13936,21 +13941,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma244 = null;
-        var LBRACKET245 = null;
-        var RBRACKET247 = null;
-         var p_Expr246 = null;
+        var L_Pragma243 = null;
+        var LBRACKET244 = null;
+        var RBRACKET246 = null;
+         var p_Expr245 = null;
 
-        var L_Pragma244_tree=null;
-        var LBRACKET245_tree=null;
-        var RBRACKET247_tree=null;
+        var L_Pragma243_tree=null;
+        var LBRACKET244_tree=null;
+        var RBRACKET246_tree=null;
 
         try {
-            // xquery/XQueryParser.g:894:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
+            // xquery/XQueryParser.g:896:9: ( ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET )
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+ LBRACKET ( p_Expr[true,true] )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:894:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:896:11: ( L_Pragma )+
             var cnt115=0;
             loop115:
             do {
@@ -13964,11 +13969,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt115) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:11: L_Pragma
-                    L_Pragma244=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6505); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:896:11: L_Pragma
+                    L_Pragma243=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_ExtensionExpr6509); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma244_tree = this.adaptor.create(L_Pragma244);
-                    this.adaptor.addChild(root_0, L_Pragma244_tree);
+                    L_Pragma243_tree = this.adaptor.create(L_Pragma243);
+                    this.adaptor.addChild(root_0, L_Pragma243_tree);
                     }
 
 
@@ -13985,12 +13990,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt115++;
             } while (true);
 
-            LBRACKET245=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6508); if (this.state.failed) return retval;
+            LBRACKET244=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_ExtensionExpr6512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET245_tree = this.adaptor.create(LBRACKET245);
-            this.adaptor.addChild(root_0, LBRACKET245_tree);
+            LBRACKET244_tree = this.adaptor.create(LBRACKET244);
+            this.adaptor.addChild(root_0, LBRACKET244_tree);
             }
-            // xquery/XQueryParser.g:894:30: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:896:30: ( p_Expr[true,true] )?
             var alt116=2;
             var LA116_0 = this.input.LA(1);
 
@@ -13999,23 +14004,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt116) {
                 case 1 :
-                    // xquery/XQueryParser.g:894:30: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6510);
-                    p_Expr246=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:896:30: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ExtensionExpr6514);
+                    p_Expr245=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr246.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr245.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET247=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6514); if (this.state.failed) return retval;
+            RBRACKET246=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_ExtensionExpr6518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET247_tree = this.adaptor.create(RBRACKET247);
-            this.adaptor.addChild(root_0, RBRACKET247_tree);
+            RBRACKET246_tree = this.adaptor.create(RBRACKET246);
+            this.adaptor.addChild(root_0, RBRACKET246_tree);
             }
 
 
@@ -14053,7 +14058,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
+    // xquery/XQueryParser.g:908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );
     // $ANTLR start "p_PathExpr"
     p_PathExpr: function() {
         var retval = new XQueryParser.p_PathExpr_return();
@@ -14061,39 +14066,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SLASH248 = null;
-        var SLASH250 = null;
-        var SLASH_SLASH251 = null;
-         var p_RelativePathExpr249 = null;
+        var SLASH247 = null;
+        var SLASH249 = null;
+        var SLASH_SLASH250 = null;
+         var p_RelativePathExpr248 = null;
+         var p_RelativePathExpr251 = null;
          var p_RelativePathExpr252 = null;
-         var p_RelativePathExpr253 = null;
 
-        var SLASH248_tree=null;
-        var SLASH250_tree=null;
-        var SLASH_SLASH251_tree=null;
+        var SLASH247_tree=null;
+        var SLASH249_tree=null;
+        var SLASH_SLASH250_tree=null;
 
         try {
-            // xquery/XQueryParser.g:907:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
+            // xquery/XQueryParser.g:909:9: ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr )
             var alt117=4;
             alt117 = this.dfa117.predict(this.input);
             switch (alt117) {
                 case 1 :
-                    // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:907:41: ( SLASH p_RelativePathExpr )
-                    // xquery/XQueryParser.g:907:42: SLASH p_RelativePathExpr
-                    SLASH248=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6557); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:909:41: ( SLASH p_RelativePathExpr )
+                    // xquery/XQueryParser.g:909:42: SLASH p_RelativePathExpr
+                    SLASH247=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6561); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH248_tree = this.adaptor.create(SLASH248);
-                    this.adaptor.addChild(root_0, SLASH248_tree);
+                    SLASH247_tree = this.adaptor.create(SLASH247);
+                    this.adaptor.addChild(root_0, SLASH247_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6559);
-                    p_RelativePathExpr249=this.p_RelativePathExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6563);
+                    p_RelativePathExpr248=this.p_RelativePathExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr249.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr248.getTree());
 
 
 
@@ -14101,27 +14106,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:908:11: SLASH
+                    // xquery/XQueryParser.g:910:11: SLASH
                     root_0 = this.adaptor.nil();
 
-                    SLASH250=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6572); if (this.state.failed) return retval;
+                    SLASH249=this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_p_PathExpr6576); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH250_tree = this.adaptor.create(SLASH250);
-                    this.adaptor.addChild(root_0, SLASH250_tree);
+                    SLASH249_tree = this.adaptor.create(SLASH249);
+                    this.adaptor.addChild(root_0, SLASH249_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:909:11: SLASH_SLASH p_RelativePathExpr
+                    // xquery/XQueryParser.g:911:11: SLASH_SLASH p_RelativePathExpr
                     root_0 = this.adaptor.nil();
 
-                    SLASH_SLASH251=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6584); if (this.state.failed) return retval;
+                    SLASH_SLASH250=this.match(this.input,SLASH_SLASH,XQueryParser.FOLLOW_SLASH_SLASH_in_p_PathExpr6588); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SLASH_SLASH251_tree = this.adaptor.create(SLASH_SLASH251);
-                    this.adaptor.addChild(root_0, SLASH_SLASH251_tree);
+                    SLASH_SLASH250_tree = this.adaptor.create(SLASH_SLASH250);
+                    this.adaptor.addChild(root_0, SLASH_SLASH250_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6586);
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6590);
+                    p_RelativePathExpr251=this.p_RelativePathExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr251.getTree());
+
+
+                    break;
+                case 4 :
+                    // xquery/XQueryParser.g:912:11: p_RelativePathExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6602);
                     p_RelativePathExpr252=this.p_RelativePathExpr();
 
                     this.state._fsp--;
@@ -14129,19 +14147,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr252.getTree());
 
 
-                    break;
-                case 4 :
-                    // xquery/XQueryParser.g:910:11: p_RelativePathExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_p_PathExpr6598);
-                    p_RelativePathExpr253=this.p_RelativePathExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RelativePathExpr253.getTree());
-
-
                     break;
 
             }
@@ -14178,7 +14183,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:914:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
+    // xquery/XQueryParser.g:916:1: p_RelativePathExpr : p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* ;
     // $ANTLR start "p_RelativePathExpr"
     p_RelativePathExpr: function() {
         var retval = new XQueryParser.p_RelativePathExpr_return();
@@ -14186,24 +14191,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set255 = null;
-         var p_StepExpr254 = null;
-         var p_StepExpr256 = null;
+        var set254 = null;
+         var p_StepExpr253 = null;
+         var p_StepExpr255 = null;
 
-        var set255_tree=null;
+        var set254_tree=null;
 
         try {
-            // xquery/XQueryParser.g:915:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
-            // xquery/XQueryParser.g:915:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            // xquery/XQueryParser.g:917:9: ( p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )* )
+            // xquery/XQueryParser.g:917:11: p_StepExpr ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6626);
-            p_StepExpr254=this.p_StepExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6630);
+            p_StepExpr253=this.p_StepExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr254.getTree());
-            // xquery/XQueryParser.g:915:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr253.getTree());
+            // xquery/XQueryParser.g:917:22: ( ( SLASH | SLASH_SLASH ) p_StepExpr )*
             loop118:
             do {
                 var alt118=2;
@@ -14216,11 +14221,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt118) {
                 case 1 :
-                    // xquery/XQueryParser.g:915:23: ( SLASH | SLASH_SLASH ) p_StepExpr
-                    set255=this.input.LT(1);
+                    // xquery/XQueryParser.g:917:23: ( SLASH | SLASH_SLASH ) p_StepExpr
+                    set254=this.input.LT(1);
                     if ( (this.input.LA(1)>=SLASH && this.input.LA(1)<=SLASH_SLASH) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set255));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set254));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -14229,12 +14234,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         throw mse;
                     }
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6637);
-                    p_StepExpr256=this.p_StepExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StepExpr_in_p_RelativePathExpr6641);
+                    p_StepExpr255=this.p_StepExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr256.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StepExpr255.getTree());
 
 
                     break;
@@ -14280,7 +14285,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
+    // xquery/XQueryParser.g:921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );
     // $ANTLR start "p_StepExpr"
     p_StepExpr: function() {
         var retval = new XQueryParser.p_StepExpr_return();
@@ -14288,24 +14293,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+         var p_PostfixExpr256 = null;
          var p_PostfixExpr257 = null;
-         var p_PostfixExpr258 = null;
-         var p_AxisStep259 = null;
+         var p_AxisStep258 = null;
+         var p_PostfixExpr259 = null;
          var p_PostfixExpr260 = null;
-         var p_PostfixExpr261 = null;
-         var p_AxisStep262 = null;
+         var p_AxisStep261 = null;
 
 
         try {
-            // xquery/XQueryParser.g:920:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
+            // xquery/XQueryParser.g:922:9: ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep )
             var alt119=6;
             alt119 = this.dfa119.predict(this.input);
             switch (alt119) {
                 case 1 :
-                    // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6691);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6695);
+                    p_PostfixExpr256=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr256.getTree());
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6809);
                     p_PostfixExpr257=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -14313,38 +14331,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr257.getTree());
 
 
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6805);
-                    p_PostfixExpr258=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr258.getTree());
-
-
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:926:11: ( p_KindTest )=> p_AxisStep
+                    // xquery/XQueryParser.g:928:11: ( p_KindTest )=> p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6823);
-                    p_AxisStep259=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6827);
+                    p_AxisStep258=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep259.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep258.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )=> p_PostfixExpr
+                    // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )=> p_PostfixExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6844);
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6848);
+                    p_PostfixExpr259=this.p_PostfixExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr259.getTree());
+
+
+                    break;
+                case 5 :
+                    // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )=> p_PostfixExpr
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6866);
                     p_PostfixExpr260=this.p_PostfixExpr();
 
                     this.state._fsp--;
@@ -14352,30 +14370,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr260.getTree());
 
 
-                    break;
-                case 5 :
-                    // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )=> p_PostfixExpr
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_PostfixExpr_in_p_StepExpr6862);
-                    p_PostfixExpr261=this.p_PostfixExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PostfixExpr261.getTree());
-
-
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:929:11: p_AxisStep
+                    // xquery/XQueryParser.g:931:11: p_AxisStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6874);
-                    p_AxisStep262=this.p_AxisStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AxisStep_in_p_StepExpr6878);
+                    p_AxisStep261=this.p_AxisStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep262.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AxisStep261.getTree());
 
 
                     break;
@@ -14414,7 +14419,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:933:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
+    // xquery/XQueryParser.g:935:1: p_AxisStep : ( p_ReverseStep | p_ForwardStep ) p_PredicateList ;
     // $ANTLR start "p_AxisStep"
     p_AxisStep: function() {
         var retval = new XQueryParser.p_AxisStep_return();
@@ -14422,17 +14427,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseStep263 = null;
-         var p_ForwardStep264 = null;
-         var p_PredicateList265 = null;
+         var p_ReverseStep262 = null;
+         var p_ForwardStep263 = null;
+         var p_PredicateList264 = null;
 
 
         try {
-            // xquery/XQueryParser.g:934:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
+            // xquery/XQueryParser.g:936:9: ( ( p_ReverseStep | p_ForwardStep ) p_PredicateList )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep ) p_PredicateList
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:934:11: ( p_ReverseStep | p_ForwardStep )
+            // xquery/XQueryParser.g:936:11: ( p_ReverseStep | p_ForwardStep )
             var alt120=2;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -14739,36 +14744,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt120) {
                 case 1 :
-                    // xquery/XQueryParser.g:934:12: p_ReverseStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6901);
-                    p_ReverseStep263=this.p_ReverseStep();
+                    // xquery/XQueryParser.g:936:12: p_ReverseStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseStep_in_p_AxisStep6905);
+                    p_ReverseStep262=this.p_ReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep263.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseStep262.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:934:28: p_ForwardStep
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6905);
-                    p_ForwardStep264=this.p_ForwardStep();
+                    // xquery/XQueryParser.g:936:28: p_ForwardStep
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardStep_in_p_AxisStep6909);
+                    p_ForwardStep263=this.p_ForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep264.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardStep263.getTree());
 
 
                     break;
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6908);
-            p_PredicateList265=this.p_PredicateList();
+            this.pushFollow(XQueryParser.FOLLOW_p_PredicateList_in_p_AxisStep6912);
+            p_PredicateList264=this.p_PredicateList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList265.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PredicateList264.getTree());
 
 
 
@@ -14805,7 +14810,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
+    // xquery/XQueryParser.g:940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );
     // $ANTLR start "p_ForwardStep"
     p_ForwardStep: function() {
         var retval = new XQueryParser.p_ForwardStep_return();
@@ -14813,45 +14818,45 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ForwardAxis266 = null;
-         var p_NodeTest267 = null;
-         var p_AbbrevForwardStep268 = null;
+         var p_ForwardAxis265 = null;
+         var p_NodeTest266 = null;
+         var p_AbbrevForwardStep267 = null;
 
 
         try {
-            // xquery/XQueryParser.g:939:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
+            // xquery/XQueryParser.g:941:9: ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep )
             var alt121=2;
             alt121 = this.dfa121.predict(this.input);
             switch (alt121) {
                 case 1 :
-                    // xquery/XQueryParser.g:939:11: p_ForwardAxis p_NodeTest
+                    // xquery/XQueryParser.g:941:11: p_ForwardAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6934);
-                    p_ForwardAxis266=this.p_ForwardAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ForwardAxis_in_p_ForwardStep6938);
+                    p_ForwardAxis265=this.p_ForwardAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis266.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6936);
-                    p_NodeTest267=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ForwardAxis265.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ForwardStep6940);
+                    p_NodeTest266=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest267.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest266.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:940:11: p_AbbrevForwardStep
+                    // xquery/XQueryParser.g:942:11: p_AbbrevForwardStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948);
-                    p_AbbrevForwardStep268=this.p_AbbrevForwardStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952);
+                    p_AbbrevForwardStep267=this.p_AbbrevForwardStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep268.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevForwardStep267.getTree());
 
 
                     break;
@@ -14890,7 +14895,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:944:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
+    // xquery/XQueryParser.g:946:1: p_ForwardAxis : ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON );
     // $ANTLR start "p_ForwardAxis"
     p_ForwardAxis: function() {
         var retval = new XQueryParser.p_ForwardAxis_return();
@@ -14898,38 +14903,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var CHILD269 = null;
-        var COLON_COLON270 = null;
-        var DESCENDANT271 = null;
-        var COLON_COLON272 = null;
-        var ATTRIBUTE273 = null;
-        var COLON_COLON274 = null;
-        var SELF275 = null;
-        var COLON_COLON276 = null;
-        var DESCENDANT_OR_SELF277 = null;
-        var COLON_COLON278 = null;
-        var FOLLOWING_SIBLING279 = null;
-        var COLON_COLON280 = null;
-        var FOLLOWING281 = null;
-        var COLON_COLON282 = null;
+        var CHILD268 = null;
+        var COLON_COLON269 = null;
+        var DESCENDANT270 = null;
+        var COLON_COLON271 = null;
+        var ATTRIBUTE272 = null;
+        var COLON_COLON273 = null;
+        var SELF274 = null;
+        var COLON_COLON275 = null;
+        var DESCENDANT_OR_SELF276 = null;
+        var COLON_COLON277 = null;
+        var FOLLOWING_SIBLING278 = null;
+        var COLON_COLON279 = null;
+        var FOLLOWING280 = null;
+        var COLON_COLON281 = null;
 
-        var CHILD269_tree=null;
-        var COLON_COLON270_tree=null;
-        var DESCENDANT271_tree=null;
-        var COLON_COLON272_tree=null;
-        var ATTRIBUTE273_tree=null;
-        var COLON_COLON274_tree=null;
-        var SELF275_tree=null;
-        var COLON_COLON276_tree=null;
-        var DESCENDANT_OR_SELF277_tree=null;
-        var COLON_COLON278_tree=null;
-        var FOLLOWING_SIBLING279_tree=null;
-        var COLON_COLON280_tree=null;
-        var FOLLOWING281_tree=null;
-        var COLON_COLON282_tree=null;
+        var CHILD268_tree=null;
+        var COLON_COLON269_tree=null;
+        var DESCENDANT270_tree=null;
+        var COLON_COLON271_tree=null;
+        var ATTRIBUTE272_tree=null;
+        var COLON_COLON273_tree=null;
+        var SELF274_tree=null;
+        var COLON_COLON275_tree=null;
+        var DESCENDANT_OR_SELF276_tree=null;
+        var COLON_COLON277_tree=null;
+        var FOLLOWING_SIBLING278_tree=null;
+        var COLON_COLON279_tree=null;
+        var FOLLOWING280_tree=null;
+        var COLON_COLON281_tree=null;
 
         try {
-            // xquery/XQueryParser.g:945:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
+            // xquery/XQueryParser.g:947:9: ( CHILD COLON_COLON | DESCENDANT COLON_COLON | ATTRIBUTE COLON_COLON | SELF COLON_COLON | DESCENDANT_OR_SELF COLON_COLON | FOLLOWING_SIBLING COLON_COLON | FOLLOWING COLON_COLON )
             var alt122=7;
             switch ( this.input.LA(1) ) {
             case CHILD:
@@ -14963,120 +14968,120 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt122) {
                 case 1 :
-                    // xquery/XQueryParser.g:945:11: CHILD COLON_COLON
+                    // xquery/XQueryParser.g:947:11: CHILD COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    CHILD269=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6974); if (this.state.failed) return retval;
+                    CHILD268=this.match(this.input,CHILD,XQueryParser.FOLLOW_CHILD_in_p_ForwardAxis6978); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    CHILD269_tree = this.adaptor.create(CHILD269);
-                    this.adaptor.addChild(root_0, CHILD269_tree);
+                    CHILD268_tree = this.adaptor.create(CHILD268);
+                    this.adaptor.addChild(root_0, CHILD268_tree);
                     }
-                    COLON_COLON270=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6976); if (this.state.failed) return retval;
+                    COLON_COLON269=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6980); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON270_tree = this.adaptor.create(COLON_COLON270);
-                    this.adaptor.addChild(root_0, COLON_COLON270_tree);
+                    COLON_COLON269_tree = this.adaptor.create(COLON_COLON269);
+                    this.adaptor.addChild(root_0, COLON_COLON269_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:946:11: DESCENDANT COLON_COLON
+                    // xquery/XQueryParser.g:948:11: DESCENDANT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT271=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6988); if (this.state.failed) return retval;
+                    DESCENDANT270=this.match(this.input,DESCENDANT,XQueryParser.FOLLOW_DESCENDANT_in_p_ForwardAxis6992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT271_tree = this.adaptor.create(DESCENDANT271);
-                    this.adaptor.addChild(root_0, DESCENDANT271_tree);
+                    DESCENDANT270_tree = this.adaptor.create(DESCENDANT270);
+                    this.adaptor.addChild(root_0, DESCENDANT270_tree);
                     }
-                    COLON_COLON272=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6990); if (this.state.failed) return retval;
+                    COLON_COLON271=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis6994); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON272_tree = this.adaptor.create(COLON_COLON272);
-                    this.adaptor.addChild(root_0, COLON_COLON272_tree);
+                    COLON_COLON271_tree = this.adaptor.create(COLON_COLON271);
+                    this.adaptor.addChild(root_0, COLON_COLON271_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:947:11: ATTRIBUTE COLON_COLON
+                    // xquery/XQueryParser.g:949:11: ATTRIBUTE COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ATTRIBUTE273=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002); if (this.state.failed) return retval;
+                    ATTRIBUTE272=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTRIBUTE273_tree = this.adaptor.create(ATTRIBUTE273);
-                    this.adaptor.addChild(root_0, ATTRIBUTE273_tree);
+                    ATTRIBUTE272_tree = this.adaptor.create(ATTRIBUTE272);
+                    this.adaptor.addChild(root_0, ATTRIBUTE272_tree);
                     }
-                    COLON_COLON274=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7004); if (this.state.failed) return retval;
+                    COLON_COLON273=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7008); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON274_tree = this.adaptor.create(COLON_COLON274);
-                    this.adaptor.addChild(root_0, COLON_COLON274_tree);
+                    COLON_COLON273_tree = this.adaptor.create(COLON_COLON273);
+                    this.adaptor.addChild(root_0, COLON_COLON273_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:948:11: SELF COLON_COLON
+                    // xquery/XQueryParser.g:950:11: SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    SELF275=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7016); if (this.state.failed) return retval;
+                    SELF274=this.match(this.input,SELF,XQueryParser.FOLLOW_SELF_in_p_ForwardAxis7020); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    SELF275_tree = this.adaptor.create(SELF275);
-                    this.adaptor.addChild(root_0, SELF275_tree);
+                    SELF274_tree = this.adaptor.create(SELF274);
+                    this.adaptor.addChild(root_0, SELF274_tree);
                     }
-                    COLON_COLON276=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7018); if (this.state.failed) return retval;
+                    COLON_COLON275=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7022); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON276_tree = this.adaptor.create(COLON_COLON276);
-                    this.adaptor.addChild(root_0, COLON_COLON276_tree);
+                    COLON_COLON275_tree = this.adaptor.create(COLON_COLON275);
+                    this.adaptor.addChild(root_0, COLON_COLON275_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:949:11: DESCENDANT_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:951:11: DESCENDANT_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    DESCENDANT_OR_SELF277=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030); if (this.state.failed) return retval;
+                    DESCENDANT_OR_SELF276=this.match(this.input,DESCENDANT_OR_SELF,XQueryParser.FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    DESCENDANT_OR_SELF277_tree = this.adaptor.create(DESCENDANT_OR_SELF277);
-                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF277_tree);
+                    DESCENDANT_OR_SELF276_tree = this.adaptor.create(DESCENDANT_OR_SELF276);
+                    this.adaptor.addChild(root_0, DESCENDANT_OR_SELF276_tree);
                     }
-                    COLON_COLON278=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7032); if (this.state.failed) return retval;
+                    COLON_COLON277=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7036); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON278_tree = this.adaptor.create(COLON_COLON278);
-                    this.adaptor.addChild(root_0, COLON_COLON278_tree);
+                    COLON_COLON277_tree = this.adaptor.create(COLON_COLON277);
+                    this.adaptor.addChild(root_0, COLON_COLON277_tree);
                     }
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:950:11: FOLLOWING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:952:11: FOLLOWING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING_SIBLING279=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044); if (this.state.failed) return retval;
+                    FOLLOWING_SIBLING278=this.match(this.input,FOLLOWING_SIBLING,XQueryParser.FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING_SIBLING279_tree = this.adaptor.create(FOLLOWING_SIBLING279);
-                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING279_tree);
+                    FOLLOWING_SIBLING278_tree = this.adaptor.create(FOLLOWING_SIBLING278);
+                    this.adaptor.addChild(root_0, FOLLOWING_SIBLING278_tree);
                     }
-                    COLON_COLON280=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7046); if (this.state.failed) return retval;
+                    COLON_COLON279=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7050); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON280_tree = this.adaptor.create(COLON_COLON280);
-                    this.adaptor.addChild(root_0, COLON_COLON280_tree);
+                    COLON_COLON279_tree = this.adaptor.create(COLON_COLON279);
+                    this.adaptor.addChild(root_0, COLON_COLON279_tree);
                     }
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:951:11: FOLLOWING COLON_COLON
+                    // xquery/XQueryParser.g:953:11: FOLLOWING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    FOLLOWING281=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7058); if (this.state.failed) return retval;
+                    FOLLOWING280=this.match(this.input,FOLLOWING,XQueryParser.FOLLOW_FOLLOWING_in_p_ForwardAxis7062); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    FOLLOWING281_tree = this.adaptor.create(FOLLOWING281);
-                    this.adaptor.addChild(root_0, FOLLOWING281_tree);
+                    FOLLOWING280_tree = this.adaptor.create(FOLLOWING280);
+                    this.adaptor.addChild(root_0, FOLLOWING280_tree);
                     }
-                    COLON_COLON282=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7060); if (this.state.failed) return retval;
+                    COLON_COLON281=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ForwardAxis7064); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON282_tree = this.adaptor.create(COLON_COLON282);
-                    this.adaptor.addChild(root_0, COLON_COLON282_tree);
+                    COLON_COLON281_tree = this.adaptor.create(COLON_COLON281);
+                    this.adaptor.addChild(root_0, COLON_COLON281_tree);
                     }
 
 
@@ -15116,7 +15121,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:955:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
+    // xquery/XQueryParser.g:957:1: p_AbbrevForwardStep : ( ATTR_SIGN )? p_NodeTest ;
     // $ANTLR start "p_AbbrevForwardStep"
     p_AbbrevForwardStep: function() {
         var retval = new XQueryParser.p_AbbrevForwardStep_return();
@@ -15124,17 +15129,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTR_SIGN283 = null;
-         var p_NodeTest284 = null;
+        var ATTR_SIGN282 = null;
+         var p_NodeTest283 = null;
 
-        var ATTR_SIGN283_tree=null;
+        var ATTR_SIGN282_tree=null;
 
         try {
-            // xquery/XQueryParser.g:956:9: ( ( ATTR_SIGN )? p_NodeTest )
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )? p_NodeTest
+            // xquery/XQueryParser.g:958:9: ( ( ATTR_SIGN )? p_NodeTest )
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )? p_NodeTest
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:956:11: ( ATTR_SIGN )?
+            // xquery/XQueryParser.g:958:11: ( ATTR_SIGN )?
             var alt123=2;
             var LA123_0 = this.input.LA(1);
 
@@ -15143,11 +15148,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt123) {
                 case 1 :
-                    // xquery/XQueryParser.g:956:11: ATTR_SIGN
-                    ATTR_SIGN283=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:958:11: ATTR_SIGN
+                    ATTR_SIGN282=this.match(this.input,ATTR_SIGN,XQueryParser.FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ATTR_SIGN283_tree = this.adaptor.create(ATTR_SIGN283);
-                    this.adaptor.addChild(root_0, ATTR_SIGN283_tree);
+                    ATTR_SIGN282_tree = this.adaptor.create(ATTR_SIGN282);
+                    this.adaptor.addChild(root_0, ATTR_SIGN282_tree);
                     }
 
 
@@ -15155,12 +15160,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089);
-            p_NodeTest284=this.p_NodeTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093);
+            p_NodeTest283=this.p_NodeTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest284.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest283.getTree());
 
 
 
@@ -15197,7 +15202,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:960:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
+    // xquery/XQueryParser.g:962:1: p_ReverseStep : ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep );
     // $ANTLR start "p_ReverseStep"
     p_ReverseStep: function() {
         var retval = new XQueryParser.p_ReverseStep_return();
@@ -15205,13 +15210,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ReverseAxis285 = null;
-         var p_NodeTest286 = null;
-         var p_AbbrevReverseStep287 = null;
+         var p_ReverseAxis284 = null;
+         var p_NodeTest285 = null;
+         var p_AbbrevReverseStep286 = null;
 
 
         try {
-            // xquery/XQueryParser.g:961:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
+            // xquery/XQueryParser.g:963:9: ( p_ReverseAxis p_NodeTest | p_AbbrevReverseStep )
             var alt124=2;
             var LA124_0 = this.input.LA(1);
 
@@ -15230,34 +15235,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt124) {
                 case 1 :
-                    // xquery/XQueryParser.g:961:11: p_ReverseAxis p_NodeTest
+                    // xquery/XQueryParser.g:963:11: p_ReverseAxis p_NodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7115);
-                    p_ReverseAxis285=this.p_ReverseAxis();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReverseAxis_in_p_ReverseStep7119);
+                    p_ReverseAxis284=this.p_ReverseAxis();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis285.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7117);
-                    p_NodeTest286=this.p_NodeTest();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReverseAxis284.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_NodeTest_in_p_ReverseStep7121);
+                    p_NodeTest285=this.p_NodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest286.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NodeTest285.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:962:11: p_AbbrevReverseStep
+                    // xquery/XQueryParser.g:964:11: p_AbbrevReverseStep
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129);
-                    p_AbbrevReverseStep287=this.p_AbbrevReverseStep();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133);
+                    p_AbbrevReverseStep286=this.p_AbbrevReverseStep();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep287.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AbbrevReverseStep286.getTree());
 
 
                     break;
@@ -15296,7 +15301,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:966:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
+    // xquery/XQueryParser.g:968:1: p_ReverseAxis : ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON );
     // $ANTLR start "p_ReverseAxis"
     p_ReverseAxis: function() {
         var retval = new XQueryParser.p_ReverseAxis_return();
@@ -15304,30 +15309,30 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PARENT288 = null;
-        var COLON_COLON289 = null;
-        var ANCESTOR290 = null;
-        var COLON_COLON291 = null;
-        var PRECEDING_SIBLING292 = null;
-        var COLON_COLON293 = null;
-        var PRECEDING294 = null;
-        var COLON_COLON295 = null;
-        var ANCESTOR_OR_SELF296 = null;
-        var COLON_COLON297 = null;
+        var PARENT287 = null;
+        var COLON_COLON288 = null;
+        var ANCESTOR289 = null;
+        var COLON_COLON290 = null;
+        var PRECEDING_SIBLING291 = null;
+        var COLON_COLON292 = null;
+        var PRECEDING293 = null;
+        var COLON_COLON294 = null;
+        var ANCESTOR_OR_SELF295 = null;
+        var COLON_COLON296 = null;
 
-        var PARENT288_tree=null;
-        var COLON_COLON289_tree=null;
-        var ANCESTOR290_tree=null;
-        var COLON_COLON291_tree=null;
-        var PRECEDING_SIBLING292_tree=null;
-        var COLON_COLON293_tree=null;
-        var PRECEDING294_tree=null;
-        var COLON_COLON295_tree=null;
-        var ANCESTOR_OR_SELF296_tree=null;
-        var COLON_COLON297_tree=null;
+        var PARENT287_tree=null;
+        var COLON_COLON288_tree=null;
+        var ANCESTOR289_tree=null;
+        var COLON_COLON290_tree=null;
+        var PRECEDING_SIBLING291_tree=null;
+        var COLON_COLON292_tree=null;
+        var PRECEDING293_tree=null;
+        var COLON_COLON294_tree=null;
+        var ANCESTOR_OR_SELF295_tree=null;
+        var COLON_COLON296_tree=null;
 
         try {
-            // xquery/XQueryParser.g:967:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
+            // xquery/XQueryParser.g:969:9: ( PARENT COLON_COLON | ANCESTOR COLON_COLON | PRECEDING_SIBLING COLON_COLON | PRECEDING COLON_COLON | ANCESTOR_OR_SELF COLON_COLON )
             var alt125=5;
             switch ( this.input.LA(1) ) {
             case PARENT:
@@ -15355,86 +15360,86 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt125) {
                 case 1 :
-                    // xquery/XQueryParser.g:967:11: PARENT COLON_COLON
+                    // xquery/XQueryParser.g:969:11: PARENT COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PARENT288=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7155); if (this.state.failed) return retval;
+                    PARENT287=this.match(this.input,PARENT,XQueryParser.FOLLOW_PARENT_in_p_ReverseAxis7159); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PARENT288_tree = this.adaptor.create(PARENT288);
-                    this.adaptor.addChild(root_0, PARENT288_tree);
+                    PARENT287_tree = this.adaptor.create(PARENT287);
+                    this.adaptor.addChild(root_0, PARENT287_tree);
                     }
-                    COLON_COLON289=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7157); if (this.state.failed) return retval;
+                    COLON_COLON288=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON289_tree = this.adaptor.create(COLON_COLON289);
-                    this.adaptor.addChild(root_0, COLON_COLON289_tree);
+                    COLON_COLON288_tree = this.adaptor.create(COLON_COLON288);
+                    this.adaptor.addChild(root_0, COLON_COLON288_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:968:11: ANCESTOR COLON_COLON
+                    // xquery/XQueryParser.g:970:11: ANCESTOR COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR290=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7169); if (this.state.failed) return retval;
+                    ANCESTOR289=this.match(this.input,ANCESTOR,XQueryParser.FOLLOW_ANCESTOR_in_p_ReverseAxis7173); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR290_tree = this.adaptor.create(ANCESTOR290);
-                    this.adaptor.addChild(root_0, ANCESTOR290_tree);
+                    ANCESTOR289_tree = this.adaptor.create(ANCESTOR289);
+                    this.adaptor.addChild(root_0, ANCESTOR289_tree);
                     }
-                    COLON_COLON291=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7171); if (this.state.failed) return retval;
+                    COLON_COLON290=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON291_tree = this.adaptor.create(COLON_COLON291);
-                    this.adaptor.addChild(root_0, COLON_COLON291_tree);
+                    COLON_COLON290_tree = this.adaptor.create(COLON_COLON290);
+                    this.adaptor.addChild(root_0, COLON_COLON290_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:969:11: PRECEDING_SIBLING COLON_COLON
+                    // xquery/XQueryParser.g:971:11: PRECEDING_SIBLING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING_SIBLING292=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183); if (this.state.failed) return retval;
+                    PRECEDING_SIBLING291=this.match(this.input,PRECEDING_SIBLING,XQueryParser.FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING_SIBLING292_tree = this.adaptor.create(PRECEDING_SIBLING292);
-                    this.adaptor.addChild(root_0, PRECEDING_SIBLING292_tree);
+                    PRECEDING_SIBLING291_tree = this.adaptor.create(PRECEDING_SIBLING291);
+                    this.adaptor.addChild(root_0, PRECEDING_SIBLING291_tree);
                     }
-                    COLON_COLON293=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7185); if (this.state.failed) return retval;
+                    COLON_COLON292=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7189); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON293_tree = this.adaptor.create(COLON_COLON293);
-                    this.adaptor.addChild(root_0, COLON_COLON293_tree);
+                    COLON_COLON292_tree = this.adaptor.create(COLON_COLON292);
+                    this.adaptor.addChild(root_0, COLON_COLON292_tree);
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:970:11: PRECEDING COLON_COLON
+                    // xquery/XQueryParser.g:972:11: PRECEDING COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    PRECEDING294=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7197); if (this.state.failed) return retval;
+                    PRECEDING293=this.match(this.input,PRECEDING,XQueryParser.FOLLOW_PRECEDING_in_p_ReverseAxis7201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    PRECEDING294_tree = this.adaptor.create(PRECEDING294);
-                    this.adaptor.addChild(root_0, PRECEDING294_tree);
+                    PRECEDING293_tree = this.adaptor.create(PRECEDING293);
+                    this.adaptor.addChild(root_0, PRECEDING293_tree);
                     }
-                    COLON_COLON295=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7199); if (this.state.failed) return retval;
+                    COLON_COLON294=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7203); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON295_tree = this.adaptor.create(COLON_COLON295);
-                    this.adaptor.addChild(root_0, COLON_COLON295_tree);
+                    COLON_COLON294_tree = this.adaptor.create(COLON_COLON294);
+                    this.adaptor.addChild(root_0, COLON_COLON294_tree);
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:971:11: ANCESTOR_OR_SELF COLON_COLON
+                    // xquery/XQueryParser.g:973:11: ANCESTOR_OR_SELF COLON_COLON
                     root_0 = this.adaptor.nil();
 
-                    ANCESTOR_OR_SELF296=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211); if (this.state.failed) return retval;
+                    ANCESTOR_OR_SELF295=this.match(this.input,ANCESTOR_OR_SELF,XQueryParser.FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ANCESTOR_OR_SELF296_tree = this.adaptor.create(ANCESTOR_OR_SELF296);
-                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF296_tree);
+                    ANCESTOR_OR_SELF295_tree = this.adaptor.create(ANCESTOR_OR_SELF295);
+                    this.adaptor.addChild(root_0, ANCESTOR_OR_SELF295_tree);
                     }
-                    COLON_COLON297=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7213); if (this.state.failed) return retval;
+                    COLON_COLON296=this.match(this.input,COLON_COLON,XQueryParser.FOLLOW_COLON_COLON_in_p_ReverseAxis7217); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON_COLON297_tree = this.adaptor.create(COLON_COLON297);
-                    this.adaptor.addChild(root_0, COLON_COLON297_tree);
+                    COLON_COLON296_tree = this.adaptor.create(COLON_COLON296);
+                    this.adaptor.addChild(root_0, COLON_COLON296_tree);
                     }
 
 
@@ -15474,7 +15479,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:975:1: p_AbbrevReverseStep : DOT_DOT ;
+    // xquery/XQueryParser.g:977:1: p_AbbrevReverseStep : DOT_DOT ;
     // $ANTLR start "p_AbbrevReverseStep"
     p_AbbrevReverseStep: function() {
         var retval = new XQueryParser.p_AbbrevReverseStep_return();
@@ -15482,19 +15487,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT_DOT298 = null;
+        var DOT_DOT297 = null;
 
-        var DOT_DOT298_tree=null;
+        var DOT_DOT297_tree=null;
 
         try {
-            // xquery/XQueryParser.g:976:9: ( DOT_DOT )
-            // xquery/XQueryParser.g:976:11: DOT_DOT
+            // xquery/XQueryParser.g:978:9: ( DOT_DOT )
+            // xquery/XQueryParser.g:978:11: DOT_DOT
             root_0 = this.adaptor.nil();
 
-            DOT_DOT298=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239); if (this.state.failed) return retval;
+            DOT_DOT297=this.match(this.input,DOT_DOT,XQueryParser.FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT_DOT298_tree = this.adaptor.create(DOT_DOT298);
-            this.adaptor.addChild(root_0, DOT_DOT298_tree);
+            DOT_DOT297_tree = this.adaptor.create(DOT_DOT297);
+            this.adaptor.addChild(root_0, DOT_DOT297_tree);
             }
 
 
@@ -15532,7 +15537,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:980:1: p_NodeTest : ( p_KindTest | p_NameTest );
+    // xquery/XQueryParser.g:982:1: p_NodeTest : ( p_KindTest | p_NameTest );
     // $ANTLR start "p_NodeTest"
     p_NodeTest: function() {
         var retval = new XQueryParser.p_NodeTest_return();
@@ -15540,38 +15545,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_KindTest299 = null;
-         var p_NameTest300 = null;
+         var p_KindTest298 = null;
+         var p_NameTest299 = null;
 
 
         try {
-            // xquery/XQueryParser.g:981:9: ( p_KindTest | p_NameTest )
+            // xquery/XQueryParser.g:983:9: ( p_KindTest | p_NameTest )
             var alt126=2;
             alt126 = this.dfa126.predict(this.input);
             switch (alt126) {
                 case 1 :
-                    // xquery/XQueryParser.g:981:11: p_KindTest
+                    // xquery/XQueryParser.g:983:11: p_KindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7265);
-                    p_KindTest299=this.p_KindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_NodeTest7269);
+                    p_KindTest298=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest299.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest298.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:981:24: p_NameTest
+                    // xquery/XQueryParser.g:983:24: p_NameTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7269);
-                    p_NameTest300=this.p_NameTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NameTest_in_p_NodeTest7273);
+                    p_NameTest299=this.p_NameTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest300.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NameTest299.getTree());
 
 
                     break;
@@ -15610,7 +15615,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:985:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
+    // xquery/XQueryParser.g:987:1: p_NameTest : ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName );
     // $ANTLR start "p_NameTest"
     p_NameTest: function() {
         var retval = new XQueryParser.p_NameTest_return();
@@ -15618,13 +15623,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Wildcard301 = null;
+         var p_Wildcard300 = null;
+         var p_QName301 = null;
          var p_QName302 = null;
-         var p_QName303 = null;
 
 
         try {
-            // xquery/XQueryParser.g:986:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
+            // xquery/XQueryParser.g:988:9: ( ( p_Wildcard )=> p_Wildcard | ( p_NCName COLON )=> p_QName | ( p_NCName )=> p_QName )
             var alt127=3;
             var LA127_0 = this.input.LA(1);
 
@@ -15666,23 +15671,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt127) {
                 case 1 :
-                    // xquery/XQueryParser.g:986:11: ( p_Wildcard )=> p_Wildcard
+                    // xquery/XQueryParser.g:988:11: ( p_Wildcard )=> p_Wildcard
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7301);
-                    p_Wildcard301=this.p_Wildcard();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_p_NameTest7305);
+                    p_Wildcard300=this.p_Wildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard301.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Wildcard300.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:987:11: ( p_NCName COLON )=> p_QName
+                    // xquery/XQueryParser.g:989:11: ( p_NCName COLON )=> p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7322);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7326);
+                    p_QName301=this.p_QName();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName301.getTree());
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:990:11: ( p_NCName )=> p_QName
+                    root_0 = this.adaptor.nil();
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7344);
                     p_QName302=this.p_QName();
 
                     this.state._fsp--;
@@ -15690,19 +15708,6 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName302.getTree());
 
 
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:988:11: ( p_NCName )=> p_QName
-                    root_0 = this.adaptor.nil();
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_NameTest7340);
-                    p_QName303=this.p_QName();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName303.getTree());
-
-
                     break;
 
             }
@@ -15739,7 +15744,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:992:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
+    // xquery/XQueryParser.g:994:1: p_Wildcard : ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR );
     // $ANTLR start "p_Wildcard"
     p_Wildcard: function() {
         var retval = new XQueryParser.p_Wildcard_return();
@@ -15747,26 +15752,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR304 = null;
-        var COLON305 = null;
-        var COLON308 = null;
-        var STAR309 = null;
-        var COLON311 = null;
-        var STAR312 = null;
+        var STAR303 = null;
+        var COLON304 = null;
+        var COLON307 = null;
+        var STAR308 = null;
+        var COLON310 = null;
+        var STAR311 = null;
+         var p_NCName305 = null;
          var p_NCName306 = null;
-         var p_NCName307 = null;
-         var p_StringLiteral310 = null;
+         var p_StringLiteral309 = null;
 
-        var STAR304_tree=null;
-        var COLON305_tree=null;
-        var COLON308_tree=null;
-        var STAR309_tree=null;
-        var COLON311_tree=null;
-        var STAR312_tree=null;
+        var STAR303_tree=null;
+        var COLON304_tree=null;
+        var COLON307_tree=null;
+        var STAR308_tree=null;
+        var COLON310_tree=null;
+        var STAR311_tree=null;
 
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:993:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
+            // xquery/XQueryParser.g:995:9: ( STAR ( COLON p_NCName )? | p_NCName COLON STAR | p_StringLiteral COLON STAR )
             var alt129=3;
             switch ( this.input.LA(1) ) {
             case STAR:
@@ -15993,15 +15998,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt129) {
                 case 1 :
-                    // xquery/XQueryParser.g:993:11: STAR ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:11: STAR ( COLON p_NCName )?
                     root_0 = this.adaptor.nil();
 
-                    STAR304=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7370); if (this.state.failed) return retval;
+                    STAR303=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7374); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR304_tree = this.adaptor.create(STAR304);
-                    this.adaptor.addChild(root_0, STAR304_tree);
+                    STAR303_tree = this.adaptor.create(STAR303);
+                    this.adaptor.addChild(root_0, STAR303_tree);
                     }
-                    // xquery/XQueryParser.g:993:16: ( COLON p_NCName )?
+                    // xquery/XQueryParser.g:995:16: ( COLON p_NCName )?
                     var alt128=2;
                     var LA128_0 = this.input.LA(1);
 
@@ -16010,18 +16015,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt128) {
                         case 1 :
-                            // xquery/XQueryParser.g:993:17: COLON p_NCName
-                            COLON305=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7373); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:995:17: COLON p_NCName
+                            COLON304=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7377); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COLON305_tree = this.adaptor.create(COLON305);
-                            this.adaptor.addChild(root_0, COLON305_tree);
+                            COLON304_tree = this.adaptor.create(COLON304);
+                            this.adaptor.addChild(root_0, COLON304_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7375);
-                            p_NCName306=this.p_NCName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7379);
+                            p_NCName305=this.p_NCName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName305.getTree());
 
 
                             break;
@@ -16032,47 +16037,47 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:994:11: p_NCName COLON STAR
+                    // xquery/XQueryParser.g:996:11: p_NCName COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7389);
-                    p_NCName307=this.p_NCName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Wildcard7393);
+                    p_NCName306=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName307.getTree());
-                    COLON308=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7391); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName306.getTree());
+                    COLON307=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7395); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON308_tree = this.adaptor.create(COLON308);
-                    this.adaptor.addChild(root_0, COLON308_tree);
+                    COLON307_tree = this.adaptor.create(COLON307);
+                    this.adaptor.addChild(root_0, COLON307_tree);
                     }
-                    STAR309=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7393); if (this.state.failed) return retval;
+                    STAR308=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7397); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR309_tree = this.adaptor.create(STAR309);
-                    this.adaptor.addChild(root_0, STAR309_tree);
+                    STAR308_tree = this.adaptor.create(STAR308);
+                    this.adaptor.addChild(root_0, STAR308_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:995:11: p_StringLiteral COLON STAR
+                    // xquery/XQueryParser.g:997:11: p_StringLiteral COLON STAR
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7405);
-                    p_StringLiteral310=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Wildcard7409);
+                    p_StringLiteral309=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral310.getTree());
-                    COLON311=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7407); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral309.getTree());
+                    COLON310=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_p_Wildcard7411); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COLON311_tree = this.adaptor.create(COLON311);
-                    this.adaptor.addChild(root_0, COLON311_tree);
+                    COLON310_tree = this.adaptor.create(COLON310);
+                    this.adaptor.addChild(root_0, COLON310_tree);
                     }
-                    STAR312=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7409); if (this.state.failed) return retval;
+                    STAR311=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_Wildcard7413); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR312_tree = this.adaptor.create(STAR312);
-                    this.adaptor.addChild(root_0, STAR312_tree);
+                    STAR311_tree = this.adaptor.create(STAR311);
+                    this.adaptor.addChild(root_0, STAR311_tree);
                     }
 
 
@@ -16113,7 +16118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1000:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1002:1: p_PostfixExpr : p_PrimaryExpr ( p_Predicate )* ;
     // $ANTLR start "p_PostfixExpr"
     p_PostfixExpr: function() {
         var retval = new XQueryParser.p_PostfixExpr_return();
@@ -16121,22 +16126,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PrimaryExpr313 = null;
-         var p_Predicate314 = null;
+         var p_PrimaryExpr312 = null;
+         var p_Predicate313 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1001:9: ( p_PrimaryExpr ( p_Predicate )* )
-            // xquery/XQueryParser.g:1001:11: p_PrimaryExpr ( p_Predicate )*
+            // xquery/XQueryParser.g:1003:9: ( p_PrimaryExpr ( p_Predicate )* )
+            // xquery/XQueryParser.g:1003:11: p_PrimaryExpr ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447);
-            p_PrimaryExpr313=this.p_PrimaryExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451);
+            p_PrimaryExpr312=this.p_PrimaryExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr313.getTree());
-            // xquery/XQueryParser.g:1001:25: ( p_Predicate )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrimaryExpr312.getTree());
+            // xquery/XQueryParser.g:1003:25: ( p_Predicate )*
             loop130:
             do {
                 var alt130=2;
@@ -16149,13 +16154,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt130) {
                 case 1 :
-                    // xquery/XQueryParser.g:1001:26: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7450);
-                    p_Predicate314=this.p_Predicate();
+                    // xquery/XQueryParser.g:1003:26: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PostfixExpr7454);
+                    p_Predicate313=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate314.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate313.getTree());
 
 
                     break;
@@ -16201,7 +16206,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1008:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
+    // xquery/XQueryParser.g:1010:1: p_ArgumentList : LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN ;
     // $ANTLR start "p_ArgumentList"
     p_ArgumentList: function() {
         var retval = new XQueryParser.p_ArgumentList_return();
@@ -16209,27 +16214,27 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN315 = null;
-        var COMMA317 = null;
-        var RPAREN319 = null;
-         var p_Argument316 = null;
-         var p_Argument318 = null;
+        var LPAREN314 = null;
+        var COMMA316 = null;
+        var RPAREN318 = null;
+         var p_Argument315 = null;
+         var p_Argument317 = null;
 
-        var LPAREN315_tree=null;
-        var COMMA317_tree=null;
-        var RPAREN319_tree=null;
+        var LPAREN314_tree=null;
+        var COMMA316_tree=null;
+        var RPAREN318_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1009:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
-            // xquery/XQueryParser.g:1009:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
+            // xquery/XQueryParser.g:1011:9: ( LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN )
+            // xquery/XQueryParser.g:1011:11: LPAREN ( p_Argument ( COMMA p_Argument )* )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN315=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7491); if (this.state.failed) return retval;
+            LPAREN314=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ArgumentList7495); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN315_tree = this.adaptor.create(LPAREN315);
-            this.adaptor.addChild(root_0, LPAREN315_tree);
+            LPAREN314_tree = this.adaptor.create(LPAREN314);
+            this.adaptor.addChild(root_0, LPAREN314_tree);
             }
-            // xquery/XQueryParser.g:1009:18: ( p_Argument ( COMMA p_Argument )* )?
+            // xquery/XQueryParser.g:1011:18: ( p_Argument ( COMMA p_Argument )* )?
             var alt132=2;
             var LA132_0 = this.input.LA(1);
 
@@ -16238,14 +16243,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt132) {
                 case 1 :
-                    // xquery/XQueryParser.g:1009:19: p_Argument ( COMMA p_Argument )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7494);
-                    p_Argument316=this.p_Argument();
+                    // xquery/XQueryParser.g:1011:19: p_Argument ( COMMA p_Argument )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7498);
+                    p_Argument315=this.p_Argument();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument316.getTree());
-                    // xquery/XQueryParser.g:1009:30: ( COMMA p_Argument )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument315.getTree());
+                    // xquery/XQueryParser.g:1011:30: ( COMMA p_Argument )*
                     loop131:
                     do {
                         var alt131=2;
@@ -16258,18 +16263,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt131) {
                         case 1 :
-                            // xquery/XQueryParser.g:1009:31: COMMA p_Argument
-                            COMMA317=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7497); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1011:31: COMMA p_Argument
+                            COMMA316=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ArgumentList7501); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA317_tree = this.adaptor.create(COMMA317);
-                            this.adaptor.addChild(root_0, COMMA317_tree);
+                            COMMA316_tree = this.adaptor.create(COMMA316);
+                            this.adaptor.addChild(root_0, COMMA316_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7499);
-                            p_Argument318=this.p_Argument();
+                            this.pushFollow(XQueryParser.FOLLOW_p_Argument_in_p_ArgumentList7503);
+                            p_Argument317=this.p_Argument();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument318.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Argument317.getTree());
 
 
                             break;
@@ -16285,10 +16290,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN319=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7505); if (this.state.failed) return retval;
+            RPAREN318=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ArgumentList7509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN319_tree = this.adaptor.create(RPAREN319);
-            this.adaptor.addChild(root_0, RPAREN319_tree);
+            RPAREN318_tree = this.adaptor.create(RPAREN318);
+            this.adaptor.addChild(root_0, RPAREN318_tree);
             }
 
 
@@ -16326,7 +16331,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1013:1: p_PredicateList : ( p_Predicate )* ;
+    // xquery/XQueryParser.g:1015:1: p_PredicateList : ( p_Predicate )* ;
     // $ANTLR start "p_PredicateList"
     p_PredicateList: function() {
         var retval = new XQueryParser.p_PredicateList_return();
@@ -16334,15 +16339,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Predicate320 = null;
+         var p_Predicate319 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1014:9: ( ( p_Predicate )* )
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:9: ( ( p_Predicate )* )
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1014:11: ( p_Predicate )*
+            // xquery/XQueryParser.g:1016:11: ( p_Predicate )*
             loop133:
             do {
                 var alt133=2;
@@ -16355,13 +16360,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt133) {
                 case 1 :
-                    // xquery/XQueryParser.g:1014:11: p_Predicate
-                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7531);
-                    p_Predicate320=this.p_Predicate();
+                    // xquery/XQueryParser.g:1016:11: p_Predicate
+                    this.pushFollow(XQueryParser.FOLLOW_p_Predicate_in_p_PredicateList7535);
+                    p_Predicate319=this.p_Predicate();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate320.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Predicate319.getTree());
 
 
                     break;
@@ -16407,7 +16412,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1018:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
+    // xquery/XQueryParser.g:1020:1: p_Predicate : LSQUARE p_Expr[true,true] RSQUARE ;
     // $ANTLR start "p_Predicate"
     p_Predicate: function() {
         var retval = new XQueryParser.p_Predicate_return();
@@ -16415,33 +16420,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LSQUARE321 = null;
-        var RSQUARE323 = null;
-         var p_Expr322 = null;
+        var LSQUARE320 = null;
+        var RSQUARE322 = null;
+         var p_Expr321 = null;
 
-        var LSQUARE321_tree=null;
-        var RSQUARE323_tree=null;
+        var LSQUARE320_tree=null;
+        var RSQUARE322_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1019:9: ( LSQUARE p_Expr[true,true] RSQUARE )
-            // xquery/XQueryParser.g:1019:11: LSQUARE p_Expr[true,true] RSQUARE
+            // xquery/XQueryParser.g:1021:9: ( LSQUARE p_Expr[true,true] RSQUARE )
+            // xquery/XQueryParser.g:1021:11: LSQUARE p_Expr[true,true] RSQUARE
             root_0 = this.adaptor.nil();
 
-            LSQUARE321=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7558); if (this.state.failed) return retval;
+            LSQUARE320=this.match(this.input,LSQUARE,XQueryParser.FOLLOW_LSQUARE_in_p_Predicate7562); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LSQUARE321_tree = this.adaptor.create(LSQUARE321);
-            this.adaptor.addChild(root_0, LSQUARE321_tree);
+            LSQUARE320_tree = this.adaptor.create(LSQUARE320);
+            this.adaptor.addChild(root_0, LSQUARE320_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7560);
-            p_Expr322=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_Predicate7564);
+            p_Expr321=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr322.getTree());
-            RSQUARE323=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7563); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr321.getTree());
+            RSQUARE322=this.match(this.input,RSQUARE,XQueryParser.FOLLOW_RSQUARE_in_p_Predicate7567); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RSQUARE323_tree = this.adaptor.create(RSQUARE323);
-            this.adaptor.addChild(root_0, RSQUARE323_tree);
+            RSQUARE322_tree = this.adaptor.create(RSQUARE322);
+            this.adaptor.addChild(root_0, RSQUARE322_tree);
             }
 
 
@@ -16479,7 +16484,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
+    // xquery/XQueryParser.g:1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );
     // $ANTLR start "p_PrimaryExpr"
     p_PrimaryExpr: function() {
         var retval = new XQueryParser.p_PrimaryExpr_return();
@@ -16487,136 +16492,136 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ParenthesizedExpr324 = null;
-         var p_Literal325 = null;
-         var p_VarRef326 = null;
-         var p_ContextItemExpr327 = null;
-         var p_FunctionCall328 = null;
-         var p_OrderedExpr329 = null;
-         var p_UnorderedExpr330 = null;
-         var p_Constructor331 = null;
-         var p_BlockExpr332 = null;
+         var p_ParenthesizedExpr323 = null;
+         var p_Literal324 = null;
+         var p_VarRef325 = null;
+         var p_ContextItemExpr326 = null;
+         var p_FunctionCall327 = null;
+         var p_OrderedExpr328 = null;
+         var p_UnorderedExpr329 = null;
+         var p_Constructor330 = null;
+         var p_BlockExpr331 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1025:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
+            // xquery/XQueryParser.g:1027:9: ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr )
             var alt134=9;
             alt134 = this.dfa134.predict(this.input);
             switch (alt134) {
                 case 1 :
-                    // xquery/XQueryParser.g:1025:11: ( LPAREN )=> p_ParenthesizedExpr
+                    // xquery/XQueryParser.g:1027:11: ( LPAREN )=> p_ParenthesizedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596);
-                    p_ParenthesizedExpr324=this.p_ParenthesizedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600);
+                    p_ParenthesizedExpr323=this.p_ParenthesizedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr324.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedExpr323.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1026:11: p_Literal
+                    // xquery/XQueryParser.g:1028:11: p_Literal
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7608);
-                    p_Literal325=this.p_Literal();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Literal_in_p_PrimaryExpr7612);
+                    p_Literal324=this.p_Literal();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal325.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Literal324.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1027:11: p_VarRef
+                    // xquery/XQueryParser.g:1029:11: p_VarRef
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7620);
-                    p_VarRef326=this.p_VarRef();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarRef_in_p_PrimaryExpr7624);
+                    p_VarRef325=this.p_VarRef();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef326.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarRef325.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1028:11: p_ContextItemExpr
+                    // xquery/XQueryParser.g:1030:11: p_ContextItemExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632);
-                    p_ContextItemExpr327=this.p_ContextItemExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636);
+                    p_ContextItemExpr326=this.p_ContextItemExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr327.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContextItemExpr326.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1029:11: p_FunctionCall
+                    // xquery/XQueryParser.g:1031:11: p_FunctionCall
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644);
-                    p_FunctionCall328=this.p_FunctionCall();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648);
+                    p_FunctionCall327=this.p_FunctionCall();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall328.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FunctionCall327.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1030:11: p_OrderedExpr
+                    // xquery/XQueryParser.g:1032:11: p_OrderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656);
-                    p_OrderedExpr329=this.p_OrderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660);
+                    p_OrderedExpr328=this.p_OrderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr329.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrderedExpr328.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1031:11: p_UnorderedExpr
+                    // xquery/XQueryParser.g:1033:11: p_UnorderedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668);
-                    p_UnorderedExpr330=this.p_UnorderedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672);
+                    p_UnorderedExpr329=this.p_UnorderedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr330.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnorderedExpr329.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1032:11: p_Constructor
+                    // xquery/XQueryParser.g:1034:11: p_Constructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7680);
-                    p_Constructor331=this.p_Constructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Constructor_in_p_PrimaryExpr7684);
+                    p_Constructor330=this.p_Constructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor331.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Constructor330.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1035:11: p_BlockExpr
+                    // xquery/XQueryParser.g:1037:11: p_BlockExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694);
-                    p_BlockExpr332=this.p_BlockExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698);
+                    p_BlockExpr331=this.p_BlockExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr332.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockExpr331.getTree());
 
 
                     break;
@@ -16655,7 +16660,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1039:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
+    // xquery/XQueryParser.g:1041:1: p_Literal : ( p_NumericLiteral | p_StringLiteral );
     // $ANTLR start "p_Literal"
     p_Literal: function() {
         var retval = new XQueryParser.p_Literal_return();
@@ -16663,12 +16668,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NumericLiteral333 = null;
-         var p_StringLiteral334 = null;
+         var p_NumericLiteral332 = null;
+         var p_StringLiteral333 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1040:9: ( p_NumericLiteral | p_StringLiteral )
+            // xquery/XQueryParser.g:1042:9: ( p_NumericLiteral | p_StringLiteral )
             var alt135=2;
             var LA135_0 = this.input.LA(1);
 
@@ -16687,28 +16692,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt135) {
                 case 1 :
-                    // xquery/XQueryParser.g:1040:11: p_NumericLiteral
+                    // xquery/XQueryParser.g:1042:11: p_NumericLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7720);
-                    p_NumericLiteral333=this.p_NumericLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NumericLiteral_in_p_Literal7724);
+                    p_NumericLiteral332=this.p_NumericLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral333.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NumericLiteral332.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1040:30: p_StringLiteral
+                    // xquery/XQueryParser.g:1042:30: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7724);
-                    p_StringLiteral334=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_Literal7728);
+                    p_StringLiteral333=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral334.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral333.getTree());
 
 
                     break;
@@ -16747,7 +16752,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1044:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
+    // xquery/XQueryParser.g:1046:1: p_NumericLiteral : (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral );
     // $ANTLR start "p_NumericLiteral"
     p_NumericLiteral: function() {
         var retval = new XQueryParser.p_NumericLiteral_return();
@@ -16761,7 +16766,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1045:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
+            // xquery/XQueryParser.g:1047:9: (d+= L_IntegerLiteral | d+= L_DecimalLiteral | d+= L_DoubleLiteral )
             var alt136=3;
             switch ( this.input.LA(1) ) {
             case L_IntegerLiteral:
@@ -16783,10 +16788,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt136) {
                 case 1 :
-                    // xquery/XQueryParser.g:1045:11: d+= L_IntegerLiteral
+                    // xquery/XQueryParser.g:1047:11: d+= L_IntegerLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -16801,10 +16806,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1045:48: d+= L_DecimalLiteral
+                    // xquery/XQueryParser.g:1047:48: d+= L_DecimalLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DecimalLiteral,XQueryParser.FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -16819,10 +16824,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1045:85: d+= L_DoubleLiteral
+                    // xquery/XQueryParser.g:1047:85: d+= L_DoubleLiteral
                     root_0 = this.adaptor.nil();
 
-                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768); if (this.state.failed) return retval;
+                    d=this.match(this.input,L_DoubleLiteral,XQueryParser.FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
@@ -16871,7 +16876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1049:1: p_VarRef : d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1051:1: p_VarRef : d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_VarRef"
     p_VarRef: function() {
         var retval = new XQueryParser.p_VarRef_return();
@@ -16885,16 +16890,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1050:9: (d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1050:11: d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1052:9: (d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1052:11: d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7806); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarRef7810); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7810);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarRef7814);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -16939,7 +16944,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1054:1: p_VarName : p_QName ;
+    // xquery/XQueryParser.g:1056:1: p_VarName : p_QName ;
     // $ANTLR start "p_VarName"
     p_VarName: function() {
         var retval = new XQueryParser.p_VarName_return();
@@ -16947,20 +16952,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName335 = null;
+         var p_QName334 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1055:9: ( p_QName )
-            // xquery/XQueryParser.g:1055:11: p_QName
+            // xquery/XQueryParser.g:1057:9: ( p_QName )
+            // xquery/XQueryParser.g:1057:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7838);
-            p_QName335=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_VarName7842);
+            p_QName334=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName335.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName334.getTree());
 
 
 
@@ -16997,7 +17002,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1059:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
+    // xquery/XQueryParser.g:1061:1: p_ParenthesizedExpr : LPAREN ( p_Expr[true,true] )? RPAREN ;
     // $ANTLR start "p_ParenthesizedExpr"
     p_ParenthesizedExpr: function() {
         var retval = new XQueryParser.p_ParenthesizedExpr_return();
@@ -17005,24 +17010,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN336 = null;
-        var RPAREN338 = null;
-         var p_Expr337 = null;
+        var LPAREN335 = null;
+        var RPAREN337 = null;
+         var p_Expr336 = null;
 
-        var LPAREN336_tree=null;
-        var RPAREN338_tree=null;
+        var LPAREN335_tree=null;
+        var RPAREN337_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1060:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
-            // xquery/XQueryParser.g:1060:11: LPAREN ( p_Expr[true,true] )? RPAREN
+            // xquery/XQueryParser.g:1062:9: ( LPAREN ( p_Expr[true,true] )? RPAREN )
+            // xquery/XQueryParser.g:1062:11: LPAREN ( p_Expr[true,true] )? RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN336=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7864); if (this.state.failed) return retval;
+            LPAREN335=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedExpr7868); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN336_tree = this.adaptor.create(LPAREN336);
-            this.adaptor.addChild(root_0, LPAREN336_tree);
+            LPAREN335_tree = this.adaptor.create(LPAREN335);
+            this.adaptor.addChild(root_0, LPAREN335_tree);
             }
-            // xquery/XQueryParser.g:1060:18: ( p_Expr[true,true] )?
+            // xquery/XQueryParser.g:1062:18: ( p_Expr[true,true] )?
             var alt137=2;
             var LA137_0 = this.input.LA(1);
 
@@ -17031,23 +17036,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt137) {
                 case 1 :
-                    // xquery/XQueryParser.g:1060:18: p_Expr[true,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7866);
-                    p_Expr337=this.p_Expr(true, true);
+                    // xquery/XQueryParser.g:1062:18: p_Expr[true,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_ParenthesizedExpr7870);
+                    p_Expr336=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr337.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr336.getTree());
 
 
                     break;
 
             }
 
-            RPAREN338=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7870); if (this.state.failed) return retval;
+            RPAREN337=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedExpr7874); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN338_tree = this.adaptor.create(RPAREN338);
-            this.adaptor.addChild(root_0, RPAREN338_tree);
+            RPAREN337_tree = this.adaptor.create(RPAREN337);
+            this.adaptor.addChild(root_0, RPAREN337_tree);
             }
 
 
@@ -17085,7 +17090,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1064:1: p_ContextItemExpr : DOT ;
+    // xquery/XQueryParser.g:1066:1: p_ContextItemExpr : DOT ;
     // $ANTLR start "p_ContextItemExpr"
     p_ContextItemExpr: function() {
         var retval = new XQueryParser.p_ContextItemExpr_return();
@@ -17093,19 +17098,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOT339 = null;
+        var DOT338 = null;
 
-        var DOT339_tree=null;
+        var DOT338_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1065:9: ( DOT )
-            // xquery/XQueryParser.g:1065:11: DOT
+            // xquery/XQueryParser.g:1067:9: ( DOT )
+            // xquery/XQueryParser.g:1067:11: DOT
             root_0 = this.adaptor.nil();
 
-            DOT339=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7896); if (this.state.failed) return retval;
+            DOT338=this.match(this.input,DOT,XQueryParser.FOLLOW_DOT_in_p_ContextItemExpr7900); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOT339_tree = this.adaptor.create(DOT339);
-            this.adaptor.addChild(root_0, DOT339_tree);
+            DOT338_tree = this.adaptor.create(DOT338);
+            this.adaptor.addChild(root_0, DOT338_tree);
             }
 
 
@@ -17143,7 +17148,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1069:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1071:1: p_OrderedExpr : k= ORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_OrderedExpr"
     p_OrderedExpr: function() {
         var retval = new XQueryParser.p_OrderedExpr_return();
@@ -17152,20 +17157,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET340 = null;
-        var RBRACKET342 = null;
-         var p_Expr341 = null;
+        var LBRACKET339 = null;
+        var RBRACKET341 = null;
+         var p_Expr340 = null;
 
         var k_tree=null;
-        var LBRACKET340_tree=null;
-        var RBRACKET342_tree=null;
+        var LBRACKET339_tree=null;
+        var RBRACKET341_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1070:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1070:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1072:9: (k= ORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1072:11: k= ORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7924); if (this.state.failed) return retval;
+            k=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_OrderedExpr7928); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -17173,21 +17178,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET340=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7928); if (this.state.failed) return retval;
+            LBRACKET339=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_OrderedExpr7932); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET340_tree = this.adaptor.create(LBRACKET340);
-            this.adaptor.addChild(root_0, LBRACKET340_tree);
+            LBRACKET339_tree = this.adaptor.create(LBRACKET339);
+            this.adaptor.addChild(root_0, LBRACKET339_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7930);
-            p_Expr341=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_OrderedExpr7934);
+            p_Expr340=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr341.getTree());
-            RBRACKET342=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7933); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr340.getTree());
+            RBRACKET341=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_OrderedExpr7937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET342_tree = this.adaptor.create(RBRACKET342);
-            this.adaptor.addChild(root_0, RBRACKET342_tree);
+            RBRACKET341_tree = this.adaptor.create(RBRACKET341);
+            this.adaptor.addChild(root_0, RBRACKET341_tree);
             }
 
 
@@ -17225,7 +17230,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1074:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1076:1: p_UnorderedExpr : k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_UnorderedExpr"
     p_UnorderedExpr: function() {
         var retval = new XQueryParser.p_UnorderedExpr_return();
@@ -17234,20 +17239,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET343 = null;
-        var RBRACKET345 = null;
-         var p_Expr344 = null;
+        var LBRACKET342 = null;
+        var RBRACKET344 = null;
+         var p_Expr343 = null;
 
         var k_tree=null;
-        var LBRACKET343_tree=null;
-        var RBRACKET345_tree=null;
+        var LBRACKET342_tree=null;
+        var RBRACKET344_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1075:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1075:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1077:9: (k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1077:11: k= UNORDERED LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7961); if (this.state.failed) return retval;
+            k=this.match(this.input,UNORDERED,XQueryParser.FOLLOW_UNORDERED_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -17255,21 +17260,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET343=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7965); if (this.state.failed) return retval;
+            LBRACKET342=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_UnorderedExpr7969); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET343_tree = this.adaptor.create(LBRACKET343);
-            this.adaptor.addChild(root_0, LBRACKET343_tree);
+            LBRACKET342_tree = this.adaptor.create(LBRACKET342);
+            this.adaptor.addChild(root_0, LBRACKET342_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7967);
-            p_Expr344=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_UnorderedExpr7971);
+            p_Expr343=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr344.getTree());
-            RBRACKET345=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7970); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr343.getTree());
+            RBRACKET344=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_UnorderedExpr7974); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET345_tree = this.adaptor.create(RBRACKET345);
-            this.adaptor.addChild(root_0, RBRACKET345_tree);
+            RBRACKET344_tree = this.adaptor.create(RBRACKET344);
+            this.adaptor.addChild(root_0, RBRACKET344_tree);
             }
 
 
@@ -17307,7 +17312,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1080:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
+    // xquery/XQueryParser.g:1082:1: p_FunctionCall : f= pg_FQName p_ArgumentList ;
     // $ANTLR start "p_FunctionCall"
     p_FunctionCall: function() {
         var retval = new XQueryParser.p_FunctionCall_return();
@@ -17316,15 +17321,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
          var f = null;
-         var p_ArgumentList346 = null;
+         var p_ArgumentList345 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1081:9: (f= pg_FQName p_ArgumentList )
-            // xquery/XQueryParser.g:1081:11: f= pg_FQName p_ArgumentList
+            // xquery/XQueryParser.g:1083:9: (f= pg_FQName p_ArgumentList )
+            // xquery/XQueryParser.g:1083:11: f= pg_FQName p_ArgumentList
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall7999);
+            this.pushFollow(XQueryParser.FOLLOW_pg_FQName_in_p_FunctionCall8003);
             f=this.pg_FQName();
 
             this.state._fsp--;
@@ -17333,12 +17338,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.af((f?f.start:null), (f?f.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8004);
-            p_ArgumentList346=this.p_ArgumentList();
+            this.pushFollow(XQueryParser.FOLLOW_p_ArgumentList_in_p_FunctionCall8008);
+            p_ArgumentList345=this.p_ArgumentList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList346.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentList345.getTree());
 
 
 
@@ -17375,7 +17380,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1085:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
+    // xquery/XQueryParser.g:1087:1: p_Argument : ( p_ExprSingle[true] | p_ArgumentPlaceholder );
     // $ANTLR start "p_Argument"
     p_Argument: function() {
         var retval = new XQueryParser.p_Argument_return();
@@ -17383,12 +17388,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle347 = null;
-         var p_ArgumentPlaceholder348 = null;
+         var p_ExprSingle346 = null;
+         var p_ArgumentPlaceholder347 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1086:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
+            // xquery/XQueryParser.g:1088:9: ( p_ExprSingle[true] | p_ArgumentPlaceholder )
             var alt138=2;
             var LA138_0 = this.input.LA(1);
 
@@ -17407,28 +17412,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt138) {
                 case 1 :
-                    // xquery/XQueryParser.g:1086:11: p_ExprSingle[true]
+                    // xquery/XQueryParser.g:1088:11: p_ExprSingle[true]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8030);
-                    p_ExprSingle347=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_Argument8034);
+                    p_ExprSingle346=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle347.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle346.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1086:32: p_ArgumentPlaceholder
+                    // xquery/XQueryParser.g:1088:32: p_ArgumentPlaceholder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035);
-                    p_ArgumentPlaceholder348=this.p_ArgumentPlaceholder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039);
+                    p_ArgumentPlaceholder347=this.p_ArgumentPlaceholder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder348.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ArgumentPlaceholder347.getTree());
 
 
                     break;
@@ -17467,7 +17472,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1090:1: p_ArgumentPlaceholder : QUESTION ;
+    // xquery/XQueryParser.g:1092:1: p_ArgumentPlaceholder : QUESTION ;
     // $ANTLR start "p_ArgumentPlaceholder"
     p_ArgumentPlaceholder: function() {
         var retval = new XQueryParser.p_ArgumentPlaceholder_return();
@@ -17475,19 +17480,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION349 = null;
+        var QUESTION348 = null;
 
-        var QUESTION349_tree=null;
+        var QUESTION348_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1091:9: ( QUESTION )
-            // xquery/XQueryParser.g:1091:11: QUESTION
+            // xquery/XQueryParser.g:1093:9: ( QUESTION )
+            // xquery/XQueryParser.g:1093:11: QUESTION
             root_0 = this.adaptor.nil();
 
-            QUESTION349=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061); if (this.state.failed) return retval;
+            QUESTION348=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            QUESTION349_tree = this.adaptor.create(QUESTION349);
-            this.adaptor.addChild(root_0, QUESTION349_tree);
+            QUESTION348_tree = this.adaptor.create(QUESTION348);
+            this.adaptor.addChild(root_0, QUESTION348_tree);
             }
 
 
@@ -17525,7 +17530,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1095:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
+    // xquery/XQueryParser.g:1097:1: p_Constructor : ( p_DirectConstructor | p_ComputedConstructor );
     // $ANTLR start "p_Constructor"
     p_Constructor: function() {
         var retval = new XQueryParser.p_Constructor_return();
@@ -17533,12 +17538,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor350 = null;
-         var p_ComputedConstructor351 = null;
+         var p_DirectConstructor349 = null;
+         var p_ComputedConstructor350 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1096:9: ( p_DirectConstructor | p_ComputedConstructor )
+            // xquery/XQueryParser.g:1098:9: ( p_DirectConstructor | p_ComputedConstructor )
             var alt139=2;
             var LA139_0 = this.input.LA(1);
 
@@ -17560,28 +17565,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt139) {
                 case 1 :
-                    // xquery/XQueryParser.g:1096:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1098:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8087);
-                    p_DirectConstructor350=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_p_Constructor8091);
+                    p_DirectConstructor349=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor350.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor349.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1097:11: p_ComputedConstructor
+                    // xquery/XQueryParser.g:1099:11: p_ComputedConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8099);
-                    p_ComputedConstructor351=this.p_ComputedConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ComputedConstructor_in_p_Constructor8103);
+                    p_ComputedConstructor350=this.p_ComputedConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor351.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ComputedConstructor350.getTree());
 
 
                     break;
@@ -17620,7 +17625,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1101:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
+    // xquery/XQueryParser.g:1103:1: p_DirectConstructor : ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor );
     // $ANTLR start "p_DirectConstructor"
     p_DirectConstructor: function() {
         var retval = new XQueryParser.p_DirectConstructor_return();
@@ -17628,13 +17633,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirElemConstructor352 = null;
-         var p_DirCommentConstructor353 = null;
-         var p_DirPIConstructor354 = null;
+         var p_DirElemConstructor351 = null;
+         var p_DirCommentConstructor352 = null;
+         var p_DirPIConstructor353 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1102:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
+            // xquery/XQueryParser.g:1104:9: ( p_DirElemConstructor | p_DirCommentConstructor | p_DirPIConstructor )
             var alt140=3;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -17656,41 +17661,41 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt140) {
                 case 1 :
-                    // xquery/XQueryParser.g:1102:11: p_DirElemConstructor
+                    // xquery/XQueryParser.g:1104:11: p_DirElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125);
-                    p_DirElemConstructor352=this.p_DirElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129);
+                    p_DirElemConstructor351=this.p_DirElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor352.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirElemConstructor351.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1103:11: p_DirCommentConstructor
+                    // xquery/XQueryParser.g:1105:11: p_DirCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137);
-                    p_DirCommentConstructor353=this.p_DirCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141);
+                    p_DirCommentConstructor352=this.p_DirCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor353.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirCommentConstructor352.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1104:11: p_DirPIConstructor
+                    // xquery/XQueryParser.g:1106:11: p_DirPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149);
-                    p_DirPIConstructor354=this.p_DirPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153);
+                    p_DirPIConstructor353=this.p_DirPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor354.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirPIConstructor353.getTree());
 
 
                     break;
@@ -17729,7 +17734,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1108:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
+    // xquery/XQueryParser.g:1110:1: p_DirElemConstructor : SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) ;
     // $ANTLR start "p_DirElemConstructor"
     p_DirElemConstructor: function() {
         var retval = new XQueryParser.p_DirElemConstructor_return();
@@ -17737,23 +17742,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SMALLER355 = null;
-        var EMPTY_CLOSE_TAG357 = null;
-        var GREATER358 = null;
-        var CLOSE_TAG360 = null;
-        var S361 = null;
-        var GREATER362 = null;
+        var SMALLER354 = null;
+        var EMPTY_CLOSE_TAG356 = null;
+        var GREATER357 = null;
+        var CLOSE_TAG359 = null;
+        var S360 = null;
+        var GREATER361 = null;
          var ts = null;
          var te = null;
-         var p_DirAttributeList356 = null;
-         var pm_DirElemContent359 = null;
+         var p_DirAttributeList355 = null;
+         var pm_DirElemContent358 = null;
 
-        var SMALLER355_tree=null;
-        var EMPTY_CLOSE_TAG357_tree=null;
-        var GREATER358_tree=null;
-        var CLOSE_TAG360_tree=null;
-        var S361_tree=null;
-        var GREATER362_tree=null;
+        var SMALLER354_tree=null;
+        var EMPTY_CLOSE_TAG356_tree=null;
+        var GREATER357_tree=null;
+        var CLOSE_TAG359_tree=null;
+        var S360_tree=null;
+        var GREATER361_tree=null;
         var stream_CLOSE_TAG=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token CLOSE_TAG");
         var stream_GREATER=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token GREATER");
         var stream_S=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token S");
@@ -17763,15 +17768,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_pm_DirElemContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pm_DirElemContent");
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1109:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
-            // xquery/XQueryParser.g:1109:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
-            SMALLER355=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8176); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER355);
+            // xquery/XQueryParser.g:1111:9: ( SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) ) -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) ) )
+            // xquery/XQueryParser.g:1111:11: SMALLER ts= p_QName p_DirAttributeList ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            SMALLER354=this.match(this.input,SMALLER,XQueryParser.FOLLOW_SMALLER_in_p_DirElemConstructor8180); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_SMALLER.add(SMALLER354);
 
             if ( this.state.backtracking===0 ) {
               this.pushXMLLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8192);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8196);
             ts=this.p_QName();
 
             this.state._fsp--;
@@ -17780,13 +17785,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.at((ts?ts.start:null), (ts?ts.stop:null));
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197);
-            p_DirAttributeList356=this.p_DirAttributeList();
+            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201);
+            p_DirAttributeList355=this.p_DirAttributeList();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList356.getTree());
-            // xquery/XQueryParser.g:1111:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
+            if ( this.state.backtracking===0 ) stream_p_DirAttributeList.add(p_DirAttributeList355.getTree());
+            // xquery/XQueryParser.g:1113:11: ( EMPTY_CLOSE_TAG | ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER ) )
             var alt143=2;
             var LA143_0 = this.input.LA(1);
 
@@ -17805,21 +17810,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt143) {
                 case 1 :
-                    // xquery/XQueryParser.g:1111:12: EMPTY_CLOSE_TAG
-                    EMPTY_CLOSE_TAG357=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG357);
+                    // xquery/XQueryParser.g:1113:12: EMPTY_CLOSE_TAG
+                    EMPTY_CLOSE_TAG356=this.match(this.input,EMPTY_CLOSE_TAG,XQueryParser.FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_EMPTY_CLOSE_TAG.add(EMPTY_CLOSE_TAG356);
 
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
-                    // xquery/XQueryParser.g:1111:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
-                    GREATER358=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8216); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER358);
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:30: ( GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER )
+                    // xquery/XQueryParser.g:1113:31: GREATER ( pm_DirElemContent )* CLOSE_TAG te= p_QName ( S )? GREATER
+                    GREATER357=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8220); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER357);
 
-                    // xquery/XQueryParser.g:1111:39: ( pm_DirElemContent )*
+                    // xquery/XQueryParser.g:1113:39: ( pm_DirElemContent )*
                     loop141:
                     do {
                         var alt141=2;
@@ -17832,13 +17837,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt141) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:39: pm_DirElemContent
-                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218);
-                            pm_DirElemContent359=this.pm_DirElemContent();
+                            // xquery/XQueryParser.g:1113:39: pm_DirElemContent
+                            this.pushFollow(XQueryParser.FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222);
+                            pm_DirElemContent358=this.pm_DirElemContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent359.getTree());
+                            if ( this.state.backtracking===0 ) stream_pm_DirElemContent.add(pm_DirElemContent358.getTree());
 
 
                             break;
@@ -17848,10 +17853,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    CLOSE_TAG360=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG360);
+                    CLOSE_TAG359=this.match(this.input,CLOSE_TAG,XQueryParser.FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_CLOSE_TAG.add(CLOSE_TAG359);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8225);
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirElemConstructor8229);
                     te=this.p_QName();
 
                     this.state._fsp--;
@@ -17860,7 +17865,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.at((te?te.start:null), (te?te.stop:null));
                     }
-                    // xquery/XQueryParser.g:1111:111: ( S )?
+                    // xquery/XQueryParser.g:1113:111: ( S )?
                     var alt142=2;
                     var LA142_0 = this.input.LA(1);
 
@@ -17869,9 +17874,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt142) {
                         case 1 :
-                            // xquery/XQueryParser.g:1111:111: S
-                            S361=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8229); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_S.add(S361);
+                            // xquery/XQueryParser.g:1113:111: S
+                            S360=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirElemConstructor8233); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_S.add(S360);
 
 
 
@@ -17879,8 +17884,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    GREATER362=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8232); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER362);
+                    GREATER361=this.match(this.input,GREATER,XQueryParser.FOLLOW_GREATER_in_p_DirElemConstructor8236); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_GREATER.add(GREATER361);
 
 
 
@@ -17894,7 +17899,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: p_DirAttributeList, pm_DirElemContent
+            // elements: pm_DirElemContent, p_DirAttributeList
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -17904,19 +17909,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1112:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+            // 1114:17: -> ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
             {
-                // xquery/XQueryParser.g:1112:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
+                // xquery/XQueryParser.g:1114:20: ^( DirElemConstructor ^( DirAttributeList ( p_DirAttributeList )* ) ^( DirElemContent ( pm_DirElemContent )* ) )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirElemConstructor, "DirElemConstructor"), root_1);
 
-                // xquery/XQueryParser.g:1112:41: ^( DirAttributeList ( p_DirAttributeList )* )
+                // xquery/XQueryParser.g:1114:41: ^( DirAttributeList ( p_DirAttributeList )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeList, "DirAttributeList"), root_2);
 
-                // xquery/XQueryParser.g:1112:60: ( p_DirAttributeList )*
+                // xquery/XQueryParser.g:1114:60: ( p_DirAttributeList )*
                 while ( stream_p_DirAttributeList.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_p_DirAttributeList.nextTree());
 
@@ -17925,12 +17930,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 this.adaptor.addChild(root_1, root_2);
                 }
-                // xquery/XQueryParser.g:1112:81: ^( DirElemContent ( pm_DirElemContent )* )
+                // xquery/XQueryParser.g:1114:81: ^( DirElemContent ( pm_DirElemContent )* )
                 {
                 var root_2 = this.adaptor.nil();
                 root_2 = this.adaptor.becomeRoot(this.adaptor.create(DirElemContent, "DirElemContent"), root_2);
 
-                // xquery/XQueryParser.g:1112:98: ( pm_DirElemContent )*
+                // xquery/XQueryParser.g:1114:98: ( pm_DirElemContent )*
                 while ( stream_pm_DirElemContent.hasNext() ) {
                     this.adaptor.addChild(root_2, stream_pm_DirElemContent.nextTree());
 
@@ -17982,7 +17987,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1117:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
+    // xquery/XQueryParser.g:1119:1: p_DirAttributeList : ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* ;
     // $ANTLR start "p_DirAttributeList"
     p_DirAttributeList: function() {
         var retval = new XQueryParser.p_DirAttributeList_return();
@@ -17990,24 +17995,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
+        var S362 = null;
         var S363 = null;
-        var S364 = null;
-        var EQUAL365 = null;
-        var S366 = null;
+        var EQUAL364 = null;
+        var S365 = null;
          var t = null;
          var v = null;
 
+        var S362_tree=null;
         var S363_tree=null;
-        var S364_tree=null;
-        var EQUAL365_tree=null;
-        var S366_tree=null;
+        var EQUAL364_tree=null;
+        var S365_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1118:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:9: ( ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )* )
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1118:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
+            // xquery/XQueryParser.g:1120:11: ( S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )? )*
             loop147:
             do {
                 var alt147=2;
@@ -18020,13 +18025,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt147) {
                 case 1 :
-                    // xquery/XQueryParser.g:1118:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
-                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8309); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1120:12: S (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    S362=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8313); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    S363_tree = this.adaptor.create(S363);
-                    this.adaptor.addChild(root_0, S363_tree);
+                    S362_tree = this.adaptor.create(S362);
+                    this.adaptor.addChild(root_0, S362_tree);
                     }
-                    // xquery/XQueryParser.g:1118:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
+                    // xquery/XQueryParser.g:1120:14: (t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue )?
                     var alt146=2;
                     var LA146_0 = this.input.LA(1);
 
@@ -18035,8 +18040,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt146) {
                         case 1 :
-                            // xquery/XQueryParser.g:1118:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
-                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8314);
+                            // xquery/XQueryParser.g:1120:15: t= p_QName ( S )? EQUAL ( S )? v= p_DirAttributeValue
+                            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_DirAttributeList8318);
                             t=this.p_QName();
 
                             this.state._fsp--;
@@ -18045,7 +18050,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if ( this.state.backtracking===0 ) {
                               this.at((t?t.start:null), (t?t.stop:null));
                             }
-                            // xquery/XQueryParser.g:1118:55: ( S )?
+                            // xquery/XQueryParser.g:1120:55: ( S )?
                             var alt144=2;
                             var LA144_0 = this.input.LA(1);
 
@@ -18054,11 +18059,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt144) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:55: S
-                                    S364=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8318); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:55: S
+                                    S363=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8322); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S364_tree = this.adaptor.create(S364);
-                                    this.adaptor.addChild(root_0, S364_tree);
+                                    S363_tree = this.adaptor.create(S363);
+                                    this.adaptor.addChild(root_0, S363_tree);
                                     }
 
 
@@ -18066,12 +18071,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            EQUAL365=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8321); if (this.state.failed) return retval;
+                            EQUAL364=this.match(this.input,EQUAL,XQueryParser.FOLLOW_EQUAL_in_p_DirAttributeList8325); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            EQUAL365_tree = this.adaptor.create(EQUAL365);
-                            this.adaptor.addChild(root_0, EQUAL365_tree);
+                            EQUAL364_tree = this.adaptor.create(EQUAL364);
+                            this.adaptor.addChild(root_0, EQUAL364_tree);
                             }
-                            // xquery/XQueryParser.g:1118:64: ( S )?
+                            // xquery/XQueryParser.g:1120:64: ( S )?
                             var alt145=2;
                             var LA145_0 = this.input.LA(1);
 
@@ -18080,11 +18085,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt145) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1118:64: S
-                                    S366=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8323); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1120:64: S
+                                    S365=this.match(this.input,S,XQueryParser.FOLLOW_S_in_p_DirAttributeList8327); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    S366_tree = this.adaptor.create(S366);
-                                    this.adaptor.addChild(root_0, S366_tree);
+                                    S365_tree = this.adaptor.create(S365);
+                                    this.adaptor.addChild(root_0, S365_tree);
                                     }
 
 
@@ -18092,7 +18097,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                             }
 
-                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328);
+                            this.pushFollow(XQueryParser.FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332);
                             v=this.p_DirAttributeValue();
 
                             this.state._fsp--;
@@ -18149,7 +18154,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1122:1: p_DirAttributeValue : ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
+    // xquery/XQueryParser.g:1124:1: p_DirAttributeValue : ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) );
     // $ANTLR start "p_DirAttributeValue"
     p_DirAttributeValue: function() {
         var retval = new XQueryParser.p_DirAttributeValue_return();
@@ -18157,25 +18162,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT367 = null;
-        var ESCAPE_QUOT368 = null;
-        var APOS369 = null;
-        var QUOT371 = null;
-        var APOS372 = null;
-        var ESCAPE_APOS373 = null;
-        var QUOT374 = null;
-        var APOS376 = null;
-         var p_QuotAttrValueContent370 = null;
-         var p_AposAttrValueContent375 = null;
+        var s = null;
+        var list_s=null;
+         var p_QuotAttrValueContent366 = null;
+         var p_AposAttrValueContent367 = null;
 
-        var QUOT367_tree=null;
-        var ESCAPE_QUOT368_tree=null;
-        var APOS369_tree=null;
-        var QUOT371_tree=null;
-        var APOS372_tree=null;
-        var ESCAPE_APOS373_tree=null;
-        var QUOT374_tree=null;
-        var APOS376_tree=null;
+        var s_tree=null;
         var stream_ESCAPE_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_QUOT");
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_ESCAPE_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ESCAPE_APOS");
@@ -18183,7 +18175,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_QuotAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QuotAttrValueContent");
         var stream_p_AposAttrValueContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_AposAttrValueContent");
         try {
-            // xquery/XQueryParser.g:1123:9: ( ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
+            // xquery/XQueryParser.g:1125:9: ( (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT ) -> ^( DirAttributeValue ( p_QuotAttrValueContent )* ) | (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS ) -> ^( DirAttributeValue ( p_AposAttrValueContent )* ) )
             var alt150=2;
             var LA150_0 = this.input.LA(1);
 
@@ -18202,13 +18194,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt150) {
                 case 1 :
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:11: ( QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT )
-                    // xquery/XQueryParser.g:1123:12: QUOT ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )* QUOT
-                    QUOT367=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8360); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT367);
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:11: (s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT )
+                    // xquery/XQueryParser.g:1125:12: s+= QUOT (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )* s+= QUOT
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8366); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
 
-                    // xquery/XQueryParser.g:1123:17: ( ESCAPE_QUOT | APOS | p_QuotAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                      this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1125:45: (s+= ESCAPE_QUOT | s+= APOS | p_QuotAttrValueContent )*
                     loop148:
                     do {
                         var alt148=4;
@@ -18232,29 +18230,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt148) {
                         case 1 :
-                            // xquery/XQueryParser.g:1123:18: ESCAPE_QUOT
-                            ESCAPE_QUOT368=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(ESCAPE_QUOT368);
+                            // xquery/XQueryParser.g:1125:46: s+= ESCAPE_QUOT
+                            s=this.match(this.input,ESCAPE_QUOT,XQueryParser.FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1123:32: APOS
-                            APOS369=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8367); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_APOS.add(APOS369);
+                            // xquery/XQueryParser.g:1125:63: s+= APOS
+                            s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8379); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1123:39: p_QuotAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371);
-                            p_QuotAttrValueContent370=this.p_QuotAttrValueContent();
+                            // xquery/XQueryParser.g:1125:73: p_QuotAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383);
+                            p_QuotAttrValueContent366=this.p_QuotAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent370.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_QuotAttrValueContent.add(p_QuotAttrValueContent366.getTree());
 
 
                             break;
@@ -18264,12 +18268,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    QUOT371=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8375); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT371);
-
+                    s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8389); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -18283,14 +18296,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1124:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                    // 1126:17: -> ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1124:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
+                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_QuotAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1124:40: ( p_QuotAttrValueContent )*
+                        // xquery/XQueryParser.g:1126:40: ( p_QuotAttrValueContent )*
                         while ( stream_p_QuotAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_QuotAttrValueContent.nextTree());
 
@@ -18306,13 +18319,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:11: ( APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS )
-                    // xquery/XQueryParser.g:1125:12: APOS ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )* APOS
-                    APOS372=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8414); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS372);
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:11: (s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS )
+                    // xquery/XQueryParser.g:1127:12: s+= APOS (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )* s+= APOS
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8434); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
 
-                    // xquery/XQueryParser.g:1125:17: ( ESCAPE_APOS | QUOT | p_AposAttrValueContent )*
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = true; 
+                    }
+                    // xquery/XQueryParser.g:1127:46: (s+= ESCAPE_APOS | s+= QUOT | p_AposAttrValueContent )*
                     loop149:
                     do {
                         var alt149=4;
@@ -18336,29 +18355,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt149) {
                         case 1 :
-                            // xquery/XQueryParser.g:1125:18: ESCAPE_APOS
-                            ESCAPE_APOS373=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(ESCAPE_APOS373);
+                            // xquery/XQueryParser.g:1127:47: s+= ESCAPE_APOS
+                            s=this.match(this.input,ESCAPE_APOS,XQueryParser.FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_ESCAPE_APOS.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1125:32: QUOT
-                            QUOT374=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8421); if (this.state.failed) return retval; 
-                            if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT374);
+                            // xquery/XQueryParser.g:1127:64: s+= QUOT
+                            s=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_DirAttributeValue8447); if (this.state.failed) return retval; 
+                            if ( this.state.backtracking===0 ) stream_QUOT.add(s);
+
+                            if (org.antlr.lang.isNull(list_s)) list_s = [];
+                            list_s.push(s);
 
 
 
                             break;
                         case 3 :
-                            // xquery/XQueryParser.g:1125:39: p_AposAttrValueContent
-                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425);
-                            p_AposAttrValueContent375=this.p_AposAttrValueContent();
+                            // xquery/XQueryParser.g:1127:74: p_AposAttrValueContent
+                            this.pushFollow(XQueryParser.FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451);
+                            p_AposAttrValueContent367=this.p_AposAttrValueContent();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent375.getTree());
+                            if ( this.state.backtracking===0 ) stream_p_AposAttrValueContent.add(p_AposAttrValueContent367.getTree());
 
 
                             break;
@@ -18368,12 +18393,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    APOS376=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8429); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS376);
-
+                    s=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_DirAttributeValue8457); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(s);
+
+                    if (org.antlr.lang.isNull(list_s)) list_s = [];
+                    list_s.push(s);
+
+                    if ( this.state.backtracking===0 ) {
+                       this.isInAttr = false; 
+                    }
 
 
 
+                    if ( this.state.backtracking===0 ) {
+                       this.addToken(list_s, "string"); 
+                    }
 
 
                     // AST REWRITE
@@ -18387,14 +18421,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1126:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                    // 1128:17: -> ^( DirAttributeValue ( p_AposAttrValueContent )* )
                     {
-                        // xquery/XQueryParser.g:1126:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
+                        // xquery/XQueryParser.g:1128:20: ^( DirAttributeValue ( p_AposAttrValueContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(DirAttributeValue, "DirAttributeValue"), root_1);
 
-                        // xquery/XQueryParser.g:1126:40: ( p_AposAttrValueContent )*
+                        // xquery/XQueryParser.g:1128:40: ( p_AposAttrValueContent )*
                         while ( stream_p_AposAttrValueContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_p_AposAttrValueContent.nextTree());
 
@@ -18444,7 +18478,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1130:1: p_QuotAttrValueContent : ( p_QuotAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1132:1: p_QuotAttrValueContent : (s= p_QuotAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_QuotAttrValueContent"
     p_QuotAttrValueContent: function() {
         var retval = new XQueryParser.p_QuotAttrValueContent_return();
@@ -18452,12 +18486,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuotAttrContentChar377 = null;
-         var pm_CommonContent378 = null;
+         var s = null;
+         var pm_CommonContent368 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1131:9: ( p_QuotAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1133:9: (s= p_QuotAttrContentChar | pm_CommonContent )
             var alt151=2;
             var LA151_0 = this.input.LA(1);
 
@@ -18476,28 +18510,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt151) {
                 case 1 :
-                    // xquery/XQueryParser.g:1131:11: p_QuotAttrContentChar
+                    // xquery/XQueryParser.g:1133:11: s= p_QuotAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481);
-                    p_QuotAttrContentChar377=this.p_QuotAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515);
+                    s=this.p_QuotAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuotAttrContentChar377.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1131:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1133:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485);
-                    pm_CommonContent378=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521);
+                    pm_CommonContent368=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent378.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent368.getTree());
 
 
                     break;
@@ -18536,7 +18573,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1135:1: p_AposAttrValueContent : ( p_AposAttrContentChar | pm_CommonContent );
+    // xquery/XQueryParser.g:1137:1: p_AposAttrValueContent : (s= p_AposAttrContentChar | pm_CommonContent );
     // $ANTLR start "p_AposAttrValueContent"
     p_AposAttrValueContent: function() {
         var retval = new XQueryParser.p_AposAttrValueContent_return();
@@ -18544,12 +18581,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AposAttrContentChar379 = null;
-         var pm_CommonContent380 = null;
+         var s = null;
+         var pm_CommonContent369 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1136:9: ( p_AposAttrContentChar | pm_CommonContent )
+            // xquery/XQueryParser.g:1138:9: (s= p_AposAttrContentChar | pm_CommonContent )
             var alt152=2;
             var LA152_0 = this.input.LA(1);
 
@@ -18568,28 +18605,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt152) {
                 case 1 :
-                    // xquery/XQueryParser.g:1136:11: p_AposAttrContentChar
+                    // xquery/XQueryParser.g:1138:11: s= p_AposAttrContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511);
-                    p_AposAttrContentChar379=this.p_AposAttrContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549);
+                    s=this.p_AposAttrContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AposAttrContentChar379.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, s.getTree());
+                    if ( this.state.backtracking===0 ) {
+                       this.addString((s?s.start:null), (s?s.stop:null)); 
+                    }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1136:35: pm_CommonContent
+                    // xquery/XQueryParser.g:1138:76: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515);
-                    pm_CommonContent380=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555);
+                    pm_CommonContent369=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent380.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent369.getTree());
 
 
                     break;
@@ -18628,7 +18668,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1140:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
+    // xquery/XQueryParser.g:1142:1: pm_DirElemContent : ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar );
     // $ANTLR start "pm_DirElemContent"
     pm_DirElemContent: function() {
         var retval = new XQueryParser.pm_DirElemContent_return();
@@ -18636,14 +18676,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DirectConstructor381 = null;
-         var p_CDataSection382 = null;
-         var pm_CommonContent383 = null;
-         var p_ElementContentChar384 = null;
+         var p_DirectConstructor370 = null;
+         var p_CDataSection371 = null;
+         var pm_CommonContent372 = null;
+         var p_ElementContentChar373 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1141:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
+            // xquery/XQueryParser.g:1143:9: ( p_DirectConstructor | p_CDataSection | pm_CommonContent | p_ElementContentChar )
             var alt153=4;
             switch ( this.input.LA(1) ) {
             case SMALLER:
@@ -18674,54 +18714,54 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt153) {
                 case 1 :
-                    // xquery/XQueryParser.g:1141:11: p_DirectConstructor
+                    // xquery/XQueryParser.g:1143:11: p_DirectConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541);
-                    p_DirectConstructor381=this.p_DirectConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581);
+                    p_DirectConstructor370=this.p_DirectConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor381.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DirectConstructor370.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1142:11: p_CDataSection
+                    // xquery/XQueryParser.g:1144:11: p_CDataSection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8553);
-                    p_CDataSection382=this.p_CDataSection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CDataSection_in_pm_DirElemContent8593);
+                    p_CDataSection371=this.p_CDataSection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection382.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CDataSection371.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1143:11: pm_CommonContent
+                    // xquery/XQueryParser.g:1145:11: pm_CommonContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8565);
-                    pm_CommonContent383=this.pm_CommonContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CommonContent_in_pm_DirElemContent8605);
+                    pm_CommonContent372=this.pm_CommonContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent383.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CommonContent372.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1144:11: p_ElementContentChar
+                    // xquery/XQueryParser.g:1146:11: p_ElementContentChar
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577);
-                    p_ElementContentChar384=this.p_ElementContentChar();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617);
+                    p_ElementContentChar373=this.p_ElementContentChar();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar384.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementContentChar373.getTree());
 
 
                     break;
@@ -18760,7 +18800,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1150:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml );
+    // xquery/XQueryParser.g:1152:1: pm_CommonContent : ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml );
     // $ANTLR start "pm_CommonContent"
     pm_CommonContent: function() {
         var retval = new XQueryParser.pm_CommonContent_return();
@@ -18768,19 +18808,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_PredefinedEntityRef385 = null;
-        var L_CharRef386 = null;
-        var ESCAPE_LBRACKET387 = null;
-        var ESCAPE_RBRACKET388 = null;
-         var pg_EnclosedExprXml389 = null;
+        var s = null;
+        var L_PredefinedEntityRef374 = null;
+        var L_CharRef375 = null;
+         var pg_EnclosedExprXml376 = null;
 
-        var L_PredefinedEntityRef385_tree=null;
-        var L_CharRef386_tree=null;
-        var ESCAPE_LBRACKET387_tree=null;
-        var ESCAPE_RBRACKET388_tree=null;
+        var s_tree=null;
+        var L_PredefinedEntityRef374_tree=null;
+        var L_CharRef375_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1151:9: ( L_PredefinedEntityRef | L_CharRef | ESCAPE_LBRACKET | ESCAPE_RBRACKET | pg_EnclosedExprXml )
+            // xquery/XQueryParser.g:1153:9: ( L_PredefinedEntityRef | L_CharRef | s= ESCAPE_LBRACKET | s= ESCAPE_RBRACKET | pg_EnclosedExprXml )
             var alt154=5;
             switch ( this.input.LA(1) ) {
             case L_PredefinedEntityRef:
@@ -18808,63 +18846,69 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt154) {
                 case 1 :
-                    // xquery/XQueryParser.g:1151:11: L_PredefinedEntityRef
+                    // xquery/XQueryParser.g:1153:11: L_PredefinedEntityRef
                     root_0 = this.adaptor.nil();
 
-                    L_PredefinedEntityRef385=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605); if (this.state.failed) return retval;
+                    L_PredefinedEntityRef374=this.match(this.input,L_PredefinedEntityRef,XQueryParser.FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_PredefinedEntityRef385_tree = this.adaptor.create(L_PredefinedEntityRef385);
-                    this.adaptor.addChild(root_0, L_PredefinedEntityRef385_tree);
+                    L_PredefinedEntityRef374_tree = this.adaptor.create(L_PredefinedEntityRef374);
+                    this.adaptor.addChild(root_0, L_PredefinedEntityRef374_tree);
                     }
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1152:11: L_CharRef
+                    // xquery/XQueryParser.g:1154:11: L_CharRef
                     root_0 = this.adaptor.nil();
 
-                    L_CharRef386=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8617); if (this.state.failed) return retval;
+                    L_CharRef375=this.match(this.input,L_CharRef,XQueryParser.FOLLOW_L_CharRef_in_pm_CommonContent8657); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_CharRef386_tree = this.adaptor.create(L_CharRef386);
-                    this.adaptor.addChild(root_0, L_CharRef386_tree);
+                    L_CharRef375_tree = this.adaptor.create(L_CharRef375);
+                    this.adaptor.addChild(root_0, L_CharRef375_tree);
                     }
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1153:11: ESCAPE_LBRACKET
+                    // xquery/XQueryParser.g:1155:11: s= ESCAPE_LBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_LBRACKET387=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_LBRACKET,XQueryParser.FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_LBRACKET387_tree = this.adaptor.create(ESCAPE_LBRACKET387);
-                    this.adaptor.addChild(root_0, ESCAPE_LBRACKET387_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1154:11: ESCAPE_RBRACKET
+                    // xquery/XQueryParser.g:1156:11: s= ESCAPE_RBRACKET
                     root_0 = this.adaptor.nil();
 
-                    ESCAPE_RBRACKET388=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641); if (this.state.failed) return retval;
+                    s=this.match(this.input,ESCAPE_RBRACKET,XQueryParser.FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    ESCAPE_RBRACKET388_tree = this.adaptor.create(ESCAPE_RBRACKET388);
-                    this.adaptor.addChild(root_0, ESCAPE_RBRACKET388_tree);
+                    s_tree = this.adaptor.create(s);
+                    this.adaptor.addChild(root_0, s_tree);
+                    }
+                    if ( this.state.backtracking===0 ) {
+                       if(this.isInAttr) { this.addToken(s, "string");  } 
                     }
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1155:11: pg_EnclosedExprXml
+                    // xquery/XQueryParser.g:1157:11: pg_EnclosedExprXml
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653);
-                    pg_EnclosedExprXml389=this.pg_EnclosedExprXml();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701);
+                    pg_EnclosedExprXml376=this.pg_EnclosedExprXml();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml389.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_EnclosedExprXml376.getTree());
 
 
                     break;
@@ -18903,7 +18947,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1163:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1165:1: pg_EnclosedExprXml : LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pg_EnclosedExprXml"
     pg_EnclosedExprXml: function() {
         var retval = new XQueryParser.pg_EnclosedExprXml_return();
@@ -18911,36 +18955,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET390 = null;
-        var RBRACKET392 = null;
-         var p_StatementsAndOptionalExpr391 = null;
+        var LBRACKET377 = null;
+        var RBRACKET379 = null;
+         var p_StatementsAndOptionalExpr378 = null;
 
-        var LBRACKET390_tree=null;
-        var RBRACKET392_tree=null;
+        var LBRACKET377_tree=null;
+        var RBRACKET379_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1164:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1164:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1166:9: ( LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1166:13: LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET390=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685); if (this.state.failed) return retval;
+            LBRACKET377=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET390_tree = this.adaptor.create(LBRACKET390);
-            this.adaptor.addChild(root_0, LBRACKET390_tree);
+            LBRACKET377_tree = this.adaptor.create(LBRACKET377);
+            this.adaptor.addChild(root_0, LBRACKET377_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.pushXQueryLexer();
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701);
-            p_StatementsAndOptionalExpr391=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749);
+            p_StatementsAndOptionalExpr378=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr391.getTree());
-            RBRACKET392=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr378.getTree());
+            RBRACKET379=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET392_tree = this.adaptor.create(RBRACKET392);
-            this.adaptor.addChild(root_0, RBRACKET392_tree);
+            RBRACKET379_tree = this.adaptor.create(RBRACKET379);
+            this.adaptor.addChild(root_0, RBRACKET379_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.popLexer();
@@ -18981,7 +19025,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1171:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
+    // xquery/XQueryParser.g:1173:1: p_DirCommentConstructor : c= L_DirCommentConstructor ;
     // $ANTLR start "p_DirCommentConstructor"
     p_DirCommentConstructor: function() {
         var retval = new XQueryParser.p_DirCommentConstructor_return();
@@ -18994,11 +19038,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var c_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1172:9: (c= L_DirCommentConstructor )
-            // xquery/XQueryParser.g:1172:11: c= L_DirCommentConstructor
+            // xquery/XQueryParser.g:1174:9: (c= L_DirCommentConstructor )
+            // xquery/XQueryParser.g:1174:11: c= L_DirCommentConstructor
             root_0 = this.adaptor.nil();
 
-            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746); if (this.state.failed) return retval;
+            c=this.match(this.input,L_DirCommentConstructor,XQueryParser.FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             c_tree = this.adaptor.create(c);
             this.adaptor.addChild(root_0, c_tree);
@@ -19042,7 +19086,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1179:1: p_DirPIConstructor : p= L_DirPIConstructor ;
+    // xquery/XQueryParser.g:1181:1: p_DirPIConstructor : p= L_DirPIConstructor ;
     // $ANTLR start "p_DirPIConstructor"
     p_DirPIConstructor: function() {
         var retval = new XQueryParser.p_DirPIConstructor_return();
@@ -19055,11 +19099,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var p_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1180:9: (p= L_DirPIConstructor )
-            // xquery/XQueryParser.g:1180:11: p= L_DirPIConstructor
+            // xquery/XQueryParser.g:1182:9: (p= L_DirPIConstructor )
+            // xquery/XQueryParser.g:1182:11: p= L_DirPIConstructor
             root_0 = this.adaptor.nil();
 
-            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782); if (this.state.failed) return retval;
+            p=this.match(this.input,L_DirPIConstructor,XQueryParser.FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             p_tree = this.adaptor.create(p);
             this.adaptor.addChild(root_0, p_tree);
@@ -19103,7 +19147,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1187:1: p_CDataSection : L_CDataSection ;
+    // xquery/XQueryParser.g:1189:1: p_CDataSection : L_CDataSection ;
     // $ANTLR start "p_CDataSection"
     p_CDataSection: function() {
         var retval = new XQueryParser.p_CDataSection_return();
@@ -19111,19 +19155,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_CDataSection393 = null;
+        var L_CDataSection380 = null;
 
-        var L_CDataSection393_tree=null;
+        var L_CDataSection380_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1188:9: ( L_CDataSection )
-            // xquery/XQueryParser.g:1188:11: L_CDataSection
+            // xquery/XQueryParser.g:1190:9: ( L_CDataSection )
+            // xquery/XQueryParser.g:1190:11: L_CDataSection
             root_0 = this.adaptor.nil();
 
-            L_CDataSection393=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8817); if (this.state.failed) return retval;
+            L_CDataSection380=this.match(this.input,L_CDataSection,XQueryParser.FOLLOW_L_CDataSection_in_p_CDataSection8865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_CDataSection393_tree = this.adaptor.create(L_CDataSection393);
-            this.adaptor.addChild(root_0, L_CDataSection393_tree);
+            L_CDataSection380_tree = this.adaptor.create(L_CDataSection380);
+            this.adaptor.addChild(root_0, L_CDataSection380_tree);
             }
 
 
@@ -19161,7 +19205,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1195:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
+    // xquery/XQueryParser.g:1197:1: p_ComputedConstructor : ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor );
     // $ANTLR start "p_ComputedConstructor"
     p_ComputedConstructor: function() {
         var retval = new XQueryParser.p_ComputedConstructor_return();
@@ -19169,18 +19213,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pm_CompDocConstructor394 = null;
-         var pm_CompElemConstructor395 = null;
-         var pm_CompAttrConstructor396 = null;
-         var p_CompNamespaceConstructor397 = null;
-         var p_CompTextConstructor398 = null;
-         var pm_CompCommentConstructor399 = null;
-         var pm_CompPIConstructor400 = null;
-         var p_CompBinaryConstructor401 = null;
+         var pm_CompDocConstructor381 = null;
+         var pm_CompElemConstructor382 = null;
+         var pm_CompAttrConstructor383 = null;
+         var p_CompNamespaceConstructor384 = null;
+         var p_CompTextConstructor385 = null;
+         var pm_CompCommentConstructor386 = null;
+         var pm_CompPIConstructor387 = null;
+         var p_CompBinaryConstructor388 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1196:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
+            // xquery/XQueryParser.g:1198:9: ( pm_CompDocConstructor | pm_CompElemConstructor | pm_CompAttrConstructor | p_CompNamespaceConstructor | p_CompTextConstructor | pm_CompCommentConstructor | pm_CompPIConstructor | {...}? => p_CompBinaryConstructor )
             var alt155=8;
             var LA155_0 = this.input.LA(1);
 
@@ -19217,110 +19261,110 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt155) {
                 case 1 :
-                    // xquery/XQueryParser.g:1196:11: pm_CompDocConstructor
+                    // xquery/XQueryParser.g:1198:11: pm_CompDocConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849);
-                    pm_CompDocConstructor394=this.pm_CompDocConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897);
+                    pm_CompDocConstructor381=this.pm_CompDocConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor394.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompDocConstructor381.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1197:11: pm_CompElemConstructor
+                    // xquery/XQueryParser.g:1199:11: pm_CompElemConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861);
-                    pm_CompElemConstructor395=this.pm_CompElemConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909);
+                    pm_CompElemConstructor382=this.pm_CompElemConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor395.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompElemConstructor382.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1198:11: pm_CompAttrConstructor
+                    // xquery/XQueryParser.g:1200:11: pm_CompAttrConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873);
-                    pm_CompAttrConstructor396=this.pm_CompAttrConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921);
+                    pm_CompAttrConstructor383=this.pm_CompAttrConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor396.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompAttrConstructor383.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1199:11: p_CompNamespaceConstructor
+                    // xquery/XQueryParser.g:1201:11: p_CompNamespaceConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885);
-                    p_CompNamespaceConstructor397=this.p_CompNamespaceConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933);
+                    p_CompNamespaceConstructor384=this.p_CompNamespaceConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor397.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompNamespaceConstructor384.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1200:11: p_CompTextConstructor
+                    // xquery/XQueryParser.g:1202:11: p_CompTextConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897);
-                    p_CompTextConstructor398=this.p_CompTextConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945);
+                    p_CompTextConstructor385=this.p_CompTextConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor398.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompTextConstructor385.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1201:11: pm_CompCommentConstructor
+                    // xquery/XQueryParser.g:1203:11: pm_CompCommentConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909);
-                    pm_CompCommentConstructor399=this.pm_CompCommentConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957);
+                    pm_CompCommentConstructor386=this.pm_CompCommentConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor399.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompCommentConstructor386.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1202:11: pm_CompPIConstructor
+                    // xquery/XQueryParser.g:1204:11: pm_CompPIConstructor
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921);
-                    pm_CompPIConstructor400=this.pm_CompPIConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969);
+                    pm_CompPIConstructor387=this.pm_CompPIConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor400.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_CompPIConstructor387.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1203:11: {...}? => p_CompBinaryConstructor
+                    // xquery/XQueryParser.g:1205:11: {...}? => p_CompBinaryConstructor
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ComputedConstructor", "this.lc(MLS)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936);
-                    p_CompBinaryConstructor401=this.p_CompBinaryConstructor();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984);
+                    p_CompBinaryConstructor388=this.p_CompBinaryConstructor();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor401.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CompBinaryConstructor388.getTree());
 
 
                     break;
@@ -19359,7 +19403,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1208:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1210:1: pm_CompDocConstructor : k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompDocConstructor"
     pm_CompDocConstructor: function() {
         var retval = new XQueryParser.pm_CompDocConstructor_return();
@@ -19368,20 +19412,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET402 = null;
-        var RBRACKET404 = null;
-         var p_StatementsAndOptionalExpr403 = null;
+        var LBRACKET389 = null;
+        var RBRACKET391 = null;
+         var p_StatementsAndOptionalExpr390 = null;
 
         var k_tree=null;
-        var LBRACKET402_tree=null;
-        var RBRACKET404_tree=null;
+        var LBRACKET389_tree=null;
+        var RBRACKET391_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1209:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1209:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1211:9: (k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1211:11: k= DOCUMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965); if (this.state.failed) return retval;
+            k=this.match(this.input,DOCUMENT,XQueryParser.FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -19389,21 +19433,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET402=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor8969); if (this.state.failed) return retval;
+            LBRACKET389=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompDocConstructor9017); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET402_tree = this.adaptor.create(LBRACKET402);
-            this.adaptor.addChild(root_0, LBRACKET402_tree);
+            LBRACKET389_tree = this.adaptor.create(LBRACKET389);
+            this.adaptor.addChild(root_0, LBRACKET389_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971);
-            p_StatementsAndOptionalExpr403=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019);
+            p_StatementsAndOptionalExpr390=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr403.getTree());
-            RBRACKET404=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor8973); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr390.getTree());
+            RBRACKET391=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompDocConstructor9021); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET404_tree = this.adaptor.create(RBRACKET404);
-            this.adaptor.addChild(root_0, RBRACKET404_tree);
+            RBRACKET391_tree = this.adaptor.create(RBRACKET391);
+            this.adaptor.addChild(root_0, RBRACKET391_tree);
             }
 
 
@@ -19441,7 +19485,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1213:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
+    // xquery/XQueryParser.g:1215:1: pm_CompElemConstructor : k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET ;
     // $ANTLR start "pm_CompElemConstructor"
     pm_CompElemConstructor: function() {
         var retval = new XQueryParser.pm_CompElemConstructor_return();
@@ -19450,26 +19494,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET406 = null;
-        var RBRACKET408 = null;
-        var LBRACKET409 = null;
-        var RBRACKET411 = null;
-         var p_QName405 = null;
-         var p_Expr407 = null;
-         var pm_ContentExpr410 = null;
+        var LBRACKET393 = null;
+        var RBRACKET395 = null;
+        var LBRACKET396 = null;
+        var RBRACKET398 = null;
+         var p_QName392 = null;
+         var p_Expr394 = null;
+         var pm_ContentExpr397 = null;
 
         var k_tree=null;
-        var LBRACKET406_tree=null;
-        var RBRACKET408_tree=null;
-        var LBRACKET409_tree=null;
-        var RBRACKET411_tree=null;
+        var LBRACKET393_tree=null;
+        var RBRACKET395_tree=null;
+        var LBRACKET396_tree=null;
+        var RBRACKET398_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1214:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
-            // xquery/XQueryParser.g:1214:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
+            // xquery/XQueryParser.g:1216:9: (k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET )
+            // xquery/XQueryParser.g:1216:11: k= ELEMENT ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET pm_ContentExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9009); if (this.state.failed) return retval;
+            k=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_pm_CompElemConstructor9057); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -19477,7 +19521,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1214:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1216:36: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt156=2;
             var LA156_0 = this.input.LA(1);
 
@@ -19496,35 +19540,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt156) {
                 case 1 :
-                    // xquery/XQueryParser.g:1214:37: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9014);
-                    p_QName405=this.p_QName();
+                    // xquery/XQueryParser.g:1216:37: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompElemConstructor9062);
+                    p_QName392=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName405.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName392.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:47: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1214:48: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET406=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9019); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:47: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1216:48: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET393=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9067); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET406_tree = this.adaptor.create(LBRACKET406);
-                    this.adaptor.addChild(root_0, LBRACKET406_tree);
+                    LBRACKET393_tree = this.adaptor.create(LBRACKET393);
+                    this.adaptor.addChild(root_0, LBRACKET393_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9021);
-                    p_Expr407=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompElemConstructor9069);
+                    p_Expr394=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr407.getTree());
-                    RBRACKET408=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9024); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr394.getTree());
+                    RBRACKET395=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9072); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET408_tree = this.adaptor.create(RBRACKET408);
-                    this.adaptor.addChild(root_0, RBRACKET408_tree);
+                    RBRACKET395_tree = this.adaptor.create(RBRACKET395);
+                    this.adaptor.addChild(root_0, RBRACKET395_tree);
                     }
 
 
@@ -19535,21 +19579,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET409=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9028); if (this.state.failed) return retval;
+            LBRACKET396=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompElemConstructor9076); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET409_tree = this.adaptor.create(LBRACKET409);
-            this.adaptor.addChild(root_0, LBRACKET409_tree);
+            LBRACKET396_tree = this.adaptor.create(LBRACKET396);
+            this.adaptor.addChild(root_0, LBRACKET396_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030);
-            pm_ContentExpr410=this.pm_ContentExpr();
+            this.pushFollow(XQueryParser.FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078);
+            pm_ContentExpr397=this.pm_ContentExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr410.getTree());
-            RBRACKET411=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9032); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pm_ContentExpr397.getTree());
+            RBRACKET398=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompElemConstructor9080); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET411_tree = this.adaptor.create(RBRACKET411);
-            this.adaptor.addChild(root_0, RBRACKET411_tree);
+            RBRACKET398_tree = this.adaptor.create(RBRACKET398);
+            this.adaptor.addChild(root_0, RBRACKET398_tree);
             }
 
 
@@ -19587,7 +19631,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1219:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1221:1: pm_ContentExpr : p_StatementsAndOptionalExpr ;
     // $ANTLR start "pm_ContentExpr"
     pm_ContentExpr: function() {
         var retval = new XQueryParser.pm_ContentExpr_return();
@@ -19595,20 +19639,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr412 = null;
+         var p_StatementsAndOptionalExpr399 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1220:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1220:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1222:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1222:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059);
-            p_StatementsAndOptionalExpr412=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107);
+            p_StatementsAndOptionalExpr399=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr412.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr399.getTree());
 
 
 
@@ -19645,7 +19689,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1225:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1227:1: pm_CompAttrConstructor : k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompAttrConstructor"
     pm_CompAttrConstructor: function() {
         var retval = new XQueryParser.pm_CompAttrConstructor_return();
@@ -19654,26 +19698,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET414 = null;
-        var RBRACKET416 = null;
-        var LBRACKET417 = null;
-        var RBRACKET419 = null;
-         var p_QName413 = null;
-         var p_Expr415 = null;
-         var p_StatementsAndOptionalExpr418 = null;
+        var LBRACKET401 = null;
+        var RBRACKET403 = null;
+        var LBRACKET404 = null;
+        var RBRACKET406 = null;
+         var p_QName400 = null;
+         var p_Expr402 = null;
+         var p_StatementsAndOptionalExpr405 = null;
 
         var k_tree=null;
-        var LBRACKET414_tree=null;
-        var RBRACKET416_tree=null;
-        var LBRACKET417_tree=null;
-        var RBRACKET419_tree=null;
+        var LBRACKET401_tree=null;
+        var RBRACKET403_tree=null;
+        var LBRACKET404_tree=null;
+        var RBRACKET406_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1226:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1226:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1228:9: (k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1228:11: k= ATTRIBUTE ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088); if (this.state.failed) return retval;
+            k=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -19681,7 +19725,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1226:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1228:38: ( p_QName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt157=2;
             var LA157_0 = this.input.LA(1);
 
@@ -19700,35 +19744,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt157) {
                 case 1 :
-                    // xquery/XQueryParser.g:1226:39: p_QName
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9093);
-                    p_QName413=this.p_QName();
+                    // xquery/XQueryParser.g:1228:39: p_QName
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_pm_CompAttrConstructor9141);
+                    p_QName400=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName413.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName400.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:49: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1226:50: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET414=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:49: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1228:50: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET401=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET414_tree = this.adaptor.create(LBRACKET414);
-                    this.adaptor.addChild(root_0, LBRACKET414_tree);
+                    LBRACKET401_tree = this.adaptor.create(LBRACKET401);
+                    this.adaptor.addChild(root_0, LBRACKET401_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9100);
-                    p_Expr415=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompAttrConstructor9148);
+                    p_Expr402=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
-                    RBRACKET416=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr402.getTree());
+                    RBRACKET403=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET416_tree = this.adaptor.create(RBRACKET416);
-                    this.adaptor.addChild(root_0, RBRACKET416_tree);
+                    RBRACKET403_tree = this.adaptor.create(RBRACKET403);
+                    this.adaptor.addChild(root_0, RBRACKET403_tree);
                     }
 
 
@@ -19739,21 +19783,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107); if (this.state.failed) return retval;
+            LBRACKET404=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
-            this.adaptor.addChild(root_0, LBRACKET417_tree);
+            LBRACKET404_tree = this.adaptor.create(LBRACKET404);
+            this.adaptor.addChild(root_0, LBRACKET404_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109);
-            p_StatementsAndOptionalExpr418=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157);
+            p_StatementsAndOptionalExpr405=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr418.getTree());
-            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr405.getTree());
+            RBRACKET406=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
-            this.adaptor.addChild(root_0, RBRACKET419_tree);
+            RBRACKET406_tree = this.adaptor.create(RBRACKET406);
+            this.adaptor.addChild(root_0, RBRACKET406_tree);
             }
 
 
@@ -19791,7 +19835,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1230:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
+    // xquery/XQueryParser.g:1232:1: p_CompNamespaceConstructor : k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET ;
     // $ANTLR start "p_CompNamespaceConstructor"
     p_CompNamespaceConstructor: function() {
         var retval = new XQueryParser.p_CompNamespaceConstructor_return();
@@ -19800,26 +19844,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET421 = null;
-        var RBRACKET423 = null;
-        var LBRACKET424 = null;
-        var RBRACKET426 = null;
-         var p_Prefix420 = null;
-         var p_PrefixExpr422 = null;
-         var p_URIExpr425 = null;
+        var LBRACKET408 = null;
+        var RBRACKET410 = null;
+        var LBRACKET411 = null;
+        var RBRACKET413 = null;
+         var p_Prefix407 = null;
+         var p_PrefixExpr409 = null;
+         var p_URIExpr412 = null;
 
         var k_tree=null;
-        var LBRACKET421_tree=null;
-        var RBRACKET423_tree=null;
-        var LBRACKET424_tree=null;
-        var RBRACKET426_tree=null;
+        var LBRACKET408_tree=null;
+        var RBRACKET410_tree=null;
+        var LBRACKET411_tree=null;
+        var RBRACKET413_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1231:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
-            // xquery/XQueryParser.g:1231:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
+            // xquery/XQueryParser.g:1233:9: (k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET )
+            // xquery/XQueryParser.g:1233:11: k= NAMESPACE ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) ) LBRACKET ( p_URIExpr )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139); if (this.state.failed) return retval;
+            k=this.match(this.input,NAMESPACE,XQueryParser.FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -19827,7 +19871,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1231:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
+            // xquery/XQueryParser.g:1233:38: ( p_Prefix | ( LBRACKET p_PrefixExpr RBRACKET ) )
             var alt158=2;
             var LA158_0 = this.input.LA(1);
 
@@ -19846,35 +19890,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt158) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:39: p_Prefix
-                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144);
-                    p_Prefix420=this.p_Prefix();
+                    // xquery/XQueryParser.g:1233:39: p_Prefix
+                    this.pushFollow(XQueryParser.FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192);
+                    p_Prefix407=this.p_Prefix();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix420.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Prefix407.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:50: ( LBRACKET p_PrefixExpr RBRACKET )
-                    // xquery/XQueryParser.g:1231:51: LBRACKET p_PrefixExpr RBRACKET
-                    LBRACKET421=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:50: ( LBRACKET p_PrefixExpr RBRACKET )
+                    // xquery/XQueryParser.g:1233:51: LBRACKET p_PrefixExpr RBRACKET
+                    LBRACKET408=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET421_tree = this.adaptor.create(LBRACKET421);
-                    this.adaptor.addChild(root_0, LBRACKET421_tree);
+                    LBRACKET408_tree = this.adaptor.create(LBRACKET408);
+                    this.adaptor.addChild(root_0, LBRACKET408_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151);
-                    p_PrefixExpr422=this.p_PrefixExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199);
+                    p_PrefixExpr409=this.p_PrefixExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr422.getTree());
-                    RBRACKET423=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PrefixExpr409.getTree());
+                    RBRACKET410=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET423_tree = this.adaptor.create(RBRACKET423);
-                    this.adaptor.addChild(root_0, RBRACKET423_tree);
+                    RBRACKET410_tree = this.adaptor.create(RBRACKET410);
+                    this.adaptor.addChild(root_0, RBRACKET410_tree);
                     }
 
 
@@ -19885,12 +19929,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET424=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157); if (this.state.failed) return retval;
+            LBRACKET411=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET424_tree = this.adaptor.create(LBRACKET424);
-            this.adaptor.addChild(root_0, LBRACKET424_tree);
+            LBRACKET411_tree = this.adaptor.create(LBRACKET411);
+            this.adaptor.addChild(root_0, LBRACKET411_tree);
             }
-            // xquery/XQueryParser.g:1231:93: ( p_URIExpr )?
+            // xquery/XQueryParser.g:1233:93: ( p_URIExpr )?
             var alt159=2;
             var LA159_0 = this.input.LA(1);
 
@@ -19899,23 +19943,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt159) {
                 case 1 :
-                    // xquery/XQueryParser.g:1231:93: p_URIExpr
-                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159);
-                    p_URIExpr425=this.p_URIExpr();
+                    // xquery/XQueryParser.g:1233:93: p_URIExpr
+                    this.pushFollow(XQueryParser.FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207);
+                    p_URIExpr412=this.p_URIExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr425.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_URIExpr412.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET426=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162); if (this.state.failed) return retval;
+            RBRACKET413=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET426_tree = this.adaptor.create(RBRACKET426);
-            this.adaptor.addChild(root_0, RBRACKET426_tree);
+            RBRACKET413_tree = this.adaptor.create(RBRACKET413);
+            this.adaptor.addChild(root_0, RBRACKET413_tree);
             }
 
 
@@ -19953,7 +19997,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1235:1: p_Prefix : p_NCName ;
+    // xquery/XQueryParser.g:1237:1: p_Prefix : p_NCName ;
     // $ANTLR start "p_Prefix"
     p_Prefix: function() {
         var retval = new XQueryParser.p_Prefix_return();
@@ -19961,20 +20005,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_NCName427 = null;
+         var p_NCName414 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1236:9: ( p_NCName )
-            // xquery/XQueryParser.g:1236:11: p_NCName
+            // xquery/XQueryParser.g:1238:9: ( p_NCName )
+            // xquery/XQueryParser.g:1238:11: p_NCName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9188);
-            p_NCName427=this.p_NCName();
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_Prefix9236);
+            p_NCName414=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName427.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName414.getTree());
 
 
 
@@ -20011,7 +20055,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1240:1: p_PrefixExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1242:1: p_PrefixExpr : p_Expr[true,true] ;
     // $ANTLR start "p_PrefixExpr"
     p_PrefixExpr: function() {
         var retval = new XQueryParser.p_PrefixExpr_return();
@@ -20019,20 +20063,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr428 = null;
+         var p_Expr415 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1241:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1241:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1243:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1243:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9214);
-            p_Expr428=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_PrefixExpr9262);
+            p_Expr415=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr415.getTree());
 
 
 
@@ -20069,7 +20113,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1245:1: p_URIExpr : p_Expr[true,true] ;
+    // xquery/XQueryParser.g:1247:1: p_URIExpr : p_Expr[true,true] ;
     // $ANTLR start "p_URIExpr"
     p_URIExpr: function() {
         var retval = new XQueryParser.p_URIExpr_return();
@@ -20077,20 +20121,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Expr429 = null;
+         var p_Expr416 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1246:9: ( p_Expr[true,true] )
-            // xquery/XQueryParser.g:1246:11: p_Expr[true,true]
+            // xquery/XQueryParser.g:1248:9: ( p_Expr[true,true] )
+            // xquery/XQueryParser.g:1248:11: p_Expr[true,true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9241);
-            p_Expr429=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_URIExpr9289);
+            p_Expr416=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr429.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr416.getTree());
 
 
 
@@ -20127,7 +20171,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1250:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1252:1: p_CompTextConstructor : k= TEXT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompTextConstructor"
     p_CompTextConstructor: function() {
         var retval = new XQueryParser.p_CompTextConstructor_return();
@@ -20136,20 +20180,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET430 = null;
-        var RBRACKET432 = null;
-         var p_Expr431 = null;
+        var LBRACKET417 = null;
+        var RBRACKET419 = null;
+         var p_Expr418 = null;
 
         var k_tree=null;
-        var LBRACKET430_tree=null;
-        var RBRACKET432_tree=null;
+        var LBRACKET417_tree=null;
+        var RBRACKET419_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1251:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1251:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1253:9: (k= TEXT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1253:11: k= TEXT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9270); if (this.state.failed) return retval;
+            k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_CompTextConstructor9318); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -20157,21 +20201,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9274); if (this.state.failed) return retval;
+            LBRACKET417=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompTextConstructor9322); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
-            this.adaptor.addChild(root_0, LBRACKET430_tree);
+            LBRACKET417_tree = this.adaptor.create(LBRACKET417);
+            this.adaptor.addChild(root_0, LBRACKET417_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9276);
-            p_Expr431=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompTextConstructor9324);
+            p_Expr418=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr431.getTree());
-            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9279); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr418.getTree());
+            RBRACKET419=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompTextConstructor9327); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
-            this.adaptor.addChild(root_0, RBRACKET432_tree);
+            RBRACKET419_tree = this.adaptor.create(RBRACKET419);
+            this.adaptor.addChild(root_0, RBRACKET419_tree);
             }
 
 
@@ -20209,7 +20253,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1255:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1257:1: p_CompBinaryConstructor : k= BINARY LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_CompBinaryConstructor"
     p_CompBinaryConstructor: function() {
         var retval = new XQueryParser.p_CompBinaryConstructor_return();
@@ -20218,20 +20262,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET433 = null;
-        var RBRACKET435 = null;
-         var p_Expr434 = null;
+        var LBRACKET420 = null;
+        var RBRACKET422 = null;
+         var p_Expr421 = null;
 
         var k_tree=null;
-        var LBRACKET433_tree=null;
-        var RBRACKET435_tree=null;
+        var LBRACKET420_tree=null;
+        var RBRACKET422_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1256:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1256:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1258:9: (k= BINARY LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1258:11: k= BINARY LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9307); if (this.state.failed) return retval;
+            k=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_CompBinaryConstructor9355); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -20239,21 +20283,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET433=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311); if (this.state.failed) return retval;
+            LBRACKET420=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET433_tree = this.adaptor.create(LBRACKET433);
-            this.adaptor.addChild(root_0, LBRACKET433_tree);
+            LBRACKET420_tree = this.adaptor.create(LBRACKET420);
+            this.adaptor.addChild(root_0, LBRACKET420_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9313);
-            p_Expr434=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_CompBinaryConstructor9361);
+            p_Expr421=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr434.getTree());
-            RBRACKET435=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr421.getTree());
+            RBRACKET422=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET435_tree = this.adaptor.create(RBRACKET435);
-            this.adaptor.addChild(root_0, RBRACKET435_tree);
+            RBRACKET422_tree = this.adaptor.create(RBRACKET422);
+            this.adaptor.addChild(root_0, RBRACKET422_tree);
             }
 
 
@@ -20291,7 +20335,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1261:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1263:1: pm_CompCommentConstructor : k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompCommentConstructor"
     pm_CompCommentConstructor: function() {
         var retval = new XQueryParser.pm_CompCommentConstructor_return();
@@ -20300,20 +20344,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET436 = null;
-        var RBRACKET438 = null;
-         var p_StatementsAndOptionalExpr437 = null;
+        var LBRACKET423 = null;
+        var RBRACKET425 = null;
+         var p_StatementsAndOptionalExpr424 = null;
 
         var k_tree=null;
-        var LBRACKET436_tree=null;
-        var RBRACKET438_tree=null;
+        var LBRACKET423_tree=null;
+        var RBRACKET425_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1262:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1262:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1264:9: (k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1264:11: k= COMMENT LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9345); if (this.state.failed) return retval;
+            k=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_pm_CompCommentConstructor9393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -20321,21 +20365,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LBRACKET436=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349); if (this.state.failed) return retval;
+            LBRACKET423=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET436_tree = this.adaptor.create(LBRACKET436);
-            this.adaptor.addChild(root_0, LBRACKET436_tree);
+            LBRACKET423_tree = this.adaptor.create(LBRACKET423);
+            this.adaptor.addChild(root_0, LBRACKET423_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351);
-            p_StatementsAndOptionalExpr437=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399);
+            p_StatementsAndOptionalExpr424=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr437.getTree());
-            RBRACKET438=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr424.getTree());
+            RBRACKET425=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET438_tree = this.adaptor.create(RBRACKET438);
-            this.adaptor.addChild(root_0, RBRACKET438_tree);
+            RBRACKET425_tree = this.adaptor.create(RBRACKET425);
+            this.adaptor.addChild(root_0, RBRACKET425_tree);
             }
 
 
@@ -20373,7 +20417,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1267:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
+    // xquery/XQueryParser.g:1269:1: pm_CompPIConstructor : k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET ;
     // $ANTLR start "pm_CompPIConstructor"
     pm_CompPIConstructor: function() {
         var retval = new XQueryParser.pm_CompPIConstructor_return();
@@ -20382,26 +20426,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LBRACKET440 = null;
-        var RBRACKET442 = null;
-        var LBRACKET443 = null;
-        var RBRACKET445 = null;
-         var p_NCName439 = null;
-         var p_Expr441 = null;
-         var p_StatementsAndOptionalExpr444 = null;
+        var LBRACKET427 = null;
+        var RBRACKET429 = null;
+        var LBRACKET430 = null;
+        var RBRACKET432 = null;
+         var p_NCName426 = null;
+         var p_Expr428 = null;
+         var p_StatementsAndOptionalExpr431 = null;
 
         var k_tree=null;
-        var LBRACKET440_tree=null;
-        var RBRACKET442_tree=null;
-        var LBRACKET443_tree=null;
-        var RBRACKET445_tree=null;
+        var LBRACKET427_tree=null;
+        var RBRACKET429_tree=null;
+        var LBRACKET430_tree=null;
+        var RBRACKET432_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1268:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
-            // xquery/XQueryParser.g:1268:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
+            // xquery/XQueryParser.g:1270:9: (k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET )
+            // xquery/XQueryParser.g:1270:11: k= PROCESSING_INSTRUCTION ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) ) LBRACKET p_StatementsAndOptionalExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382); if (this.state.failed) return retval;
+            k=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -20409,7 +20453,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:1268:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1270:51: ( p_NCName | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt160=2;
             var LA160_0 = this.input.LA(1);
 
@@ -20428,35 +20472,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt160) {
                 case 1 :
-                    // xquery/XQueryParser.g:1268:52: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9387);
-                    p_NCName439=this.p_NCName();
+                    // xquery/XQueryParser.g:1270:52: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pm_CompPIConstructor9435);
+                    p_NCName426=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName439.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName426.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:63: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1268:64: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET440=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9392); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:63: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1270:64: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET427=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9440); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET440_tree = this.adaptor.create(LBRACKET440);
-                    this.adaptor.addChild(root_0, LBRACKET440_tree);
+                    LBRACKET427_tree = this.adaptor.create(LBRACKET427);
+                    this.adaptor.addChild(root_0, LBRACKET427_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9394);
-                    p_Expr441=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_pm_CompPIConstructor9442);
+                    p_Expr428=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr441.getTree());
-                    RBRACKET442=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9397); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr428.getTree());
+                    RBRACKET429=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9445); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET442_tree = this.adaptor.create(RBRACKET442);
-                    this.adaptor.addChild(root_0, RBRACKET442_tree);
+                    RBRACKET429_tree = this.adaptor.create(RBRACKET429);
+                    this.adaptor.addChild(root_0, RBRACKET429_tree);
                     }
 
 
@@ -20467,21 +20511,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            LBRACKET443=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9401); if (this.state.failed) return retval;
+            LBRACKET430=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_pm_CompPIConstructor9449); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET443_tree = this.adaptor.create(LBRACKET443);
-            this.adaptor.addChild(root_0, LBRACKET443_tree);
+            LBRACKET430_tree = this.adaptor.create(LBRACKET430);
+            this.adaptor.addChild(root_0, LBRACKET430_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403);
-            p_StatementsAndOptionalExpr444=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451);
+            p_StatementsAndOptionalExpr431=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr444.getTree());
-            RBRACKET445=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9405); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr431.getTree());
+            RBRACKET432=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_pm_CompPIConstructor9453); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET445_tree = this.adaptor.create(RBRACKET445);
-            this.adaptor.addChild(root_0, RBRACKET445_tree);
+            RBRACKET432_tree = this.adaptor.create(RBRACKET432);
+            this.adaptor.addChild(root_0, RBRACKET432_tree);
             }
 
 
@@ -20519,7 +20563,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1290:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
+    // xquery/XQueryParser.g:1292:1: p_SingleType : p_AtomicOrUnionType ( QUESTION )? ;
     // $ANTLR start "p_SingleType"
     p_SingleType: function() {
         var retval = new XQueryParser.p_SingleType_return();
@@ -20527,23 +20571,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUESTION447 = null;
-         var p_AtomicOrUnionType446 = null;
+        var QUESTION434 = null;
+         var p_AtomicOrUnionType433 = null;
 
-        var QUESTION447_tree=null;
+        var QUESTION434_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1291:9: ( p_AtomicOrUnionType ( QUESTION )? )
-            // xquery/XQueryParser.g:1291:11: p_AtomicOrUnionType ( QUESTION )?
+            // xquery/XQueryParser.g:1293:9: ( p_AtomicOrUnionType ( QUESTION )? )
+            // xquery/XQueryParser.g:1293:11: p_AtomicOrUnionType ( QUESTION )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449);
-            p_AtomicOrUnionType446=this.p_AtomicOrUnionType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497);
+            p_AtomicOrUnionType433=this.p_AtomicOrUnionType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType446.getTree());
-            // xquery/XQueryParser.g:1291:31: ( QUESTION )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType433.getTree());
+            // xquery/XQueryParser.g:1293:31: ( QUESTION )?
             var alt161=2;
             var LA161_0 = this.input.LA(1);
 
@@ -20552,11 +20596,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt161) {
                 case 1 :
-                    // xquery/XQueryParser.g:1291:31: QUESTION
-                    QUESTION447=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9451); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1293:31: QUESTION
+                    QUESTION434=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_SingleType9499); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    QUESTION447_tree = this.adaptor.create(QUESTION447);
-                    this.adaptor.addChild(root_0, QUESTION447_tree);
+                    QUESTION434_tree = this.adaptor.create(QUESTION434);
+                    this.adaptor.addChild(root_0, QUESTION434_tree);
                     }
 
 
@@ -20600,7 +20644,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1295:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
+    // xquery/XQueryParser.g:1297:1: p_TypeDeclaration : k= AS st= p_SequenceType -> ^( TypeDeclaration $st) ;
     // $ANTLR start "p_TypeDeclaration"
     p_TypeDeclaration: function() {
         var retval = new XQueryParser.p_TypeDeclaration_return();
@@ -20615,15 +20659,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_AS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token AS");
         var stream_p_SequenceType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_SequenceType");
         try {
-            // xquery/XQueryParser.g:1296:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
-            // xquery/XQueryParser.g:1296:11: k= AS st= p_SequenceType
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9480); if (this.state.failed) return retval; 
+            // xquery/XQueryParser.g:1298:9: (k= AS st= p_SequenceType -> ^( TypeDeclaration $st) )
+            // xquery/XQueryParser.g:1298:11: k= AS st= p_SequenceType
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypeDeclaration9528); if (this.state.failed) return retval; 
             if ( this.state.backtracking===0 ) stream_AS.add(k);
 
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9486);
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypeDeclaration9534);
             st=this.p_SequenceType();
 
             this.state._fsp--;
@@ -20643,9 +20687,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_st=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token st",st!=null?st.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1297:17: -> ^( TypeDeclaration $st)
+            // 1299:17: -> ^( TypeDeclaration $st)
             {
-                // xquery/XQueryParser.g:1297:20: ^( TypeDeclaration $st)
+                // xquery/XQueryParser.g:1299:20: ^( TypeDeclaration $st)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(TypeDeclaration, "TypeDeclaration"), root_1);
@@ -20693,7 +20737,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1301:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
+    // xquery/XQueryParser.g:1303:1: p_SequenceType : (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) );
     // $ANTLR start "p_SequenceType"
     p_SequenceType: function() {
         var retval = new XQueryParser.p_SequenceType_return();
@@ -20716,7 +20760,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var stream_p_ItemType=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_ItemType");
         var stream_p_OccurrenceIndicator=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_OccurrenceIndicator");
         try {
-            // xquery/XQueryParser.g:1302:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
+            // xquery/XQueryParser.g:1304:9: (k= EMPTY_SEQUENCE l= LPAREN r= RPAREN -> ^( SequenceType ^( EmptySequenceTest $k $l $r) ) | it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )? -> ^( SequenceType $it ( $oi)? ) )
             var alt163=2;
             var LA163_0 = this.input.LA(1);
 
@@ -20749,23 +20793,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt163) {
                 case 1 :
-                    // xquery/XQueryParser.g:1302:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
-                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539); if (this.state.failed) return retval; 
+                    // xquery/XQueryParser.g:1304:11: k= EMPTY_SEQUENCE l= LPAREN r= RPAREN
+                    k=this.match(this.input,EMPTY_SEQUENCE,XQueryParser.FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_EMPTY_SEQUENCE.add(k);
 
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9545); if (this.state.failed) return retval; 
+                    l=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SequenceType9593); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_LPAREN.add(l);
 
-                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9549); if (this.state.failed) return retval; 
+                    r=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SequenceType9597); if (this.state.failed) return retval; 
                     if ( this.state.backtracking===0 ) stream_RPAREN.add(r);
 
 
 
                     // AST REWRITE
-                    // elements: l, k, r
+                    // elements: k, r, l
                     // token labels: r, l, k
                     // rule labels: retval
                     // token list labels: 
@@ -20778,14 +20822,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1303:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                    // 1305:17: -> ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                     {
-                        // xquery/XQueryParser.g:1303:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
+                        // xquery/XQueryParser.g:1305:20: ^( SequenceType ^( EmptySequenceTest $k $l $r) )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
-                        // xquery/XQueryParser.g:1303:35: ^( EmptySequenceTest $k $l $r)
+                        // xquery/XQueryParser.g:1305:35: ^( EmptySequenceTest $k $l $r)
                         {
                         var root_2 = this.adaptor.nil();
                         root_2 = this.adaptor.becomeRoot(this.adaptor.create(EmptySequenceTest, "EmptySequenceTest"), root_2);
@@ -20806,20 +20850,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1304:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9598);
+                    // xquery/XQueryParser.g:1306:11: it= p_ItemType ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_SequenceType9646);
                     it=this.p_ItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) stream_p_ItemType.add(it.getTree());
-                    // xquery/XQueryParser.g:1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
+                    // xquery/XQueryParser.g:1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?
                     var alt162=2;
                     alt162 = this.dfa162.predict(this.input);
                     switch (alt162) {
                         case 1 :
-                            // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
-                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609);
+                            // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator
+                            this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657);
                             oi=this.p_OccurrenceIndicator();
 
                             this.state._fsp--;
@@ -20846,15 +20890,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_oi=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token oi",oi!=null?oi.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1305:17: -> ^( SequenceType $it ( $oi)? )
+                    // 1307:17: -> ^( SequenceType $it ( $oi)? )
                     {
-                        // xquery/XQueryParser.g:1305:20: ^( SequenceType $it ( $oi)? )
+                        // xquery/XQueryParser.g:1307:20: ^( SequenceType $it ( $oi)? )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(SequenceType, "SequenceType"), root_1);
 
                         this.adaptor.addChild(root_1, stream_it.nextTree());
-                        // xquery/XQueryParser.g:1305:39: ( $oi)?
+                        // xquery/XQueryParser.g:1307:39: ( $oi)?
                         if ( stream_oi.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_oi.nextTree());
 
@@ -20904,7 +20948,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1309:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
+    // xquery/XQueryParser.g:1311:1: p_OccurrenceIndicator : ( QUESTION | STAR | PLUS );
     // $ANTLR start "p_OccurrenceIndicator"
     p_OccurrenceIndicator: function() {
         var retval = new XQueryParser.p_OccurrenceIndicator_return();
@@ -20912,19 +20956,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set448 = null;
+        var set435 = null;
 
-        var set448_tree=null;
+        var set435_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1310:9: ( QUESTION | STAR | PLUS )
+            // xquery/XQueryParser.g:1312:9: ( QUESTION | STAR | PLUS )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set448=this.input.LT(1);
+            set435=this.input.LT(1);
             if ( (this.input.LA(1)>=QUESTION && this.input.LA(1)<=PLUS) ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set448));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set435));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -20969,7 +21013,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
+    // xquery/XQueryParser.g:1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );
     // $ANTLR start "p_ItemType"
     p_ItemType: function() {
         var retval = new XQueryParser.p_ItemType_return();
@@ -20977,40 +21021,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var BINARY450 = null;
-        var LPAREN451 = null;
-        var RPAREN452 = null;
-        var ITEM453 = null;
-        var LPAREN454 = null;
-        var RPAREN455 = null;
-         var p_KindTest449 = null;
-         var p_AtomicOrUnionType456 = null;
-         var p_ParenthesizedItemType457 = null;
+        var BINARY437 = null;
+        var LPAREN438 = null;
+        var RPAREN439 = null;
+        var ITEM440 = null;
+        var LPAREN441 = null;
+        var RPAREN442 = null;
+         var p_KindTest436 = null;
+         var p_AtomicOrUnionType443 = null;
+         var p_ParenthesizedItemType444 = null;
 
-        var BINARY450_tree=null;
-        var LPAREN451_tree=null;
-        var RPAREN452_tree=null;
-        var ITEM453_tree=null;
-        var LPAREN454_tree=null;
-        var RPAREN455_tree=null;
+        var BINARY437_tree=null;
+        var LPAREN438_tree=null;
+        var RPAREN439_tree=null;
+        var ITEM440_tree=null;
+        var LPAREN441_tree=null;
+        var RPAREN442_tree=null;
         var stream_RPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token RPAREN");
         var stream_ITEM=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token ITEM");
         var stream_BINARY=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token BINARY");
         var stream_LPAREN=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token LPAREN");
         var stream_p_KindTest=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_KindTest");
         try {
-            // xquery/XQueryParser.g:1315:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
+            // xquery/XQueryParser.g:1317:9: ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType )
             var alt164=5;
             alt164 = this.dfa164.predict(this.input);
             switch (alt164) {
                 case 1 :
-                    // xquery/XQueryParser.g:1315:11: p_KindTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9711);
-                    p_KindTest449=this.p_KindTest();
+                    // xquery/XQueryParser.g:1317:11: p_KindTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_ItemType9759);
+                    p_KindTest436=this.p_KindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest449.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_KindTest.add(p_KindTest436.getTree());
 
 
                     // AST REWRITE
@@ -21024,9 +21068,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1316:17: -> ^( KindTest p_KindTest )
+                    // 1318:17: -> ^( KindTest p_KindTest )
                     {
-                        // xquery/XQueryParser.g:1316:20: ^( KindTest p_KindTest )
+                        // xquery/XQueryParser.g:1318:20: ^( KindTest p_KindTest )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(KindTest, "KindTest"), root_1);
@@ -21042,21 +21086,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1317:11: {...}? => ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:11: {...}? => ( BINARY LPAREN RPAREN )
                     if ( !((this.lc(MLS))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ItemType", "this.lc(MLS)");
                     }
-                    // xquery/XQueryParser.g:1317:29: ( BINARY LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1317:30: BINARY LPAREN RPAREN
-                    BINARY450=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9751); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY450);
+                    // xquery/XQueryParser.g:1319:29: ( BINARY LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1319:30: BINARY LPAREN RPAREN
+                    BINARY437=this.match(this.input,BINARY,XQueryParser.FOLLOW_BINARY_in_p_ItemType9799); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_BINARY.add(BINARY437);
 
-                    LPAREN451=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9753); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN451);
+                    LPAREN438=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN438);
 
-                    RPAREN452=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9755); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN452);
+                    RPAREN439=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9803); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN439);
 
 
 
@@ -21064,7 +21108,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: LPAREN, RPAREN, BINARY
+                    // elements: BINARY, LPAREN, RPAREN
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -21074,9 +21118,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1318:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
+                    // 1320:17: -> ^( BinaryTest BINARY LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1318:20: ^( BinaryTest BINARY LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1320:20: ^( BinaryTest BINARY LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(BinaryTest, "BinaryTest"), root_1);
@@ -21094,17 +21138,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:11: ( ITEM LPAREN RPAREN )
-                    // xquery/XQueryParser.g:1319:12: ITEM LPAREN RPAREN
-                    ITEM453=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9797); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM453);
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:11: ( ITEM LPAREN RPAREN )
+                    // xquery/XQueryParser.g:1321:12: ITEM LPAREN RPAREN
+                    ITEM440=this.match(this.input,ITEM,XQueryParser.FOLLOW_ITEM_in_p_ItemType9845); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_ITEM.add(ITEM440);
 
-                    LPAREN454=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9799); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN454);
+                    LPAREN441=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ItemType9847); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_LPAREN.add(LPAREN441);
 
-                    RPAREN455=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9801); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN455);
+                    RPAREN442=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ItemType9849); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_RPAREN.add(RPAREN442);
 
 
 
@@ -21112,7 +21156,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
                     // AST REWRITE
-                    // elements: ITEM, RPAREN, LPAREN
+                    // elements: RPAREN, LPAREN, ITEM
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -21122,9 +21166,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1320:17: -> ^( ItemTest ITEM LPAREN RPAREN )
+                    // 1322:17: -> ^( ItemTest ITEM LPAREN RPAREN )
                     {
-                        // xquery/XQueryParser.g:1320:20: ^( ItemTest ITEM LPAREN RPAREN )
+                        // xquery/XQueryParser.g:1322:20: ^( ItemTest ITEM LPAREN RPAREN )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(ItemTest, "ItemTest"), root_1);
@@ -21142,28 +21186,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1324:11: p_AtomicOrUnionType
+                    // xquery/XQueryParser.g:1326:11: p_AtomicOrUnionType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845);
-                    p_AtomicOrUnionType456=this.p_AtomicOrUnionType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893);
+                    p_AtomicOrUnionType443=this.p_AtomicOrUnionType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType456.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicOrUnionType443.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1325:11: p_ParenthesizedItemType
+                    // xquery/XQueryParser.g:1327:11: p_ParenthesizedItemType
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857);
-                    p_ParenthesizedItemType457=this.p_ParenthesizedItemType();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905);
+                    p_ParenthesizedItemType444=this.p_ParenthesizedItemType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType457.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ParenthesizedItemType444.getTree());
 
 
                     break;
@@ -21202,7 +21246,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1329:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
+    // xquery/XQueryParser.g:1331:1: p_AtomicOrUnionType : p_QName -> ^( AtomicOrUnionType p_QName ) ;
     // $ANTLR start "p_AtomicOrUnionType"
     p_AtomicOrUnionType: function() {
         var retval = new XQueryParser.p_AtomicOrUnionType_return();
@@ -21210,18 +21254,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName458 = null;
+         var p_QName445 = null;
 
         var stream_p_QName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_QName");
         try {
-            // xquery/XQueryParser.g:1330:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
-            // xquery/XQueryParser.g:1330:11: p_QName
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9883);
-            p_QName458=this.p_QName();
+            // xquery/XQueryParser.g:1332:9: ( p_QName -> ^( AtomicOrUnionType p_QName ) )
+            // xquery/XQueryParser.g:1332:11: p_QName
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicOrUnionType9931);
+            p_QName445=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName458.getTree());
+            if ( this.state.backtracking===0 ) stream_p_QName.add(p_QName445.getTree());
 
 
             // AST REWRITE
@@ -21235,9 +21279,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1331:17: -> ^( AtomicOrUnionType p_QName )
+            // 1333:17: -> ^( AtomicOrUnionType p_QName )
             {
-                // xquery/XQueryParser.g:1331:20: ^( AtomicOrUnionType p_QName )
+                // xquery/XQueryParser.g:1333:20: ^( AtomicOrUnionType p_QName )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AtomicOrUnionType, "AtomicOrUnionType"), root_1);
@@ -21285,7 +21329,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1335:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
+    // xquery/XQueryParser.g:1337:1: p_KindTest : ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest );
     // $ANTLR start "p_KindTest"
     p_KindTest: function() {
         var retval = new XQueryParser.p_KindTest_return();
@@ -21293,20 +21337,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_DocumentTest459 = null;
-         var p_ElementTest460 = null;
-         var p_AttributeTest461 = null;
-         var p_SchemaElementTest462 = null;
-         var p_SchemaAttributeTest463 = null;
-         var p_PITest464 = null;
-         var p_CommentTest465 = null;
-         var p_TextTest466 = null;
-         var p_NamespaceNodeTest467 = null;
-         var p_AnyKindTest468 = null;
+         var p_DocumentTest446 = null;
+         var p_ElementTest447 = null;
+         var p_AttributeTest448 = null;
+         var p_SchemaElementTest449 = null;
+         var p_SchemaAttributeTest450 = null;
+         var p_PITest451 = null;
+         var p_CommentTest452 = null;
+         var p_TextTest453 = null;
+         var p_NamespaceNodeTest454 = null;
+         var p_AnyKindTest455 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1336:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
+            // xquery/XQueryParser.g:1338:9: ( p_DocumentTest | p_ElementTest | p_AttributeTest | p_SchemaElementTest | p_SchemaAttributeTest | p_PITest | p_CommentTest | p_TextTest | p_NamespaceNodeTest | p_AnyKindTest )
             var alt165=10;
             switch ( this.input.LA(1) ) {
             case DOCUMENT_NODE:
@@ -21349,132 +21393,132 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt165) {
                 case 1 :
-                    // xquery/XQueryParser.g:1336:11: p_DocumentTest
+                    // xquery/XQueryParser.g:1338:11: p_DocumentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9933);
-                    p_DocumentTest459=this.p_DocumentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DocumentTest_in_p_KindTest9981);
+                    p_DocumentTest446=this.p_DocumentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest459.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DocumentTest446.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1337:11: p_ElementTest
+                    // xquery/XQueryParser.g:1339:11: p_ElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9945);
-                    p_ElementTest460=this.p_ElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_KindTest9993);
+                    p_ElementTest447=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest460.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest447.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1338:11: p_AttributeTest
+                    // xquery/XQueryParser.g:1340:11: p_AttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest9957);
-                    p_AttributeTest461=this.p_AttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeTest_in_p_KindTest10005);
+                    p_AttributeTest448=this.p_AttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest461.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeTest448.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1339:11: p_SchemaElementTest
+                    // xquery/XQueryParser.g:1341:11: p_SchemaElementTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest9969);
-                    p_SchemaElementTest462=this.p_SchemaElementTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_KindTest10017);
+                    p_SchemaElementTest449=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest449.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1340:11: p_SchemaAttributeTest
+                    // xquery/XQueryParser.g:1342:11: p_SchemaAttributeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981);
-                    p_SchemaAttributeTest463=this.p_SchemaAttributeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029);
+                    p_SchemaAttributeTest450=this.p_SchemaAttributeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest463.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaAttributeTest450.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1341:11: p_PITest
+                    // xquery/XQueryParser.g:1343:11: p_PITest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest9993);
-                    p_PITest464=this.p_PITest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_PITest_in_p_KindTest10041);
+                    p_PITest451=this.p_PITest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest464.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PITest451.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1342:11: p_CommentTest
+                    // xquery/XQueryParser.g:1344:11: p_CommentTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10005);
-                    p_CommentTest465=this.p_CommentTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CommentTest_in_p_KindTest10053);
+                    p_CommentTest452=this.p_CommentTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest465.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CommentTest452.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1343:11: p_TextTest
+                    // xquery/XQueryParser.g:1345:11: p_TextTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10017);
-                    p_TextTest466=this.p_TextTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TextTest_in_p_KindTest10065);
+                    p_TextTest453=this.p_TextTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest466.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TextTest453.getTree());
 
 
                     break;
                 case 9 :
-                    // xquery/XQueryParser.g:1344:11: p_NamespaceNodeTest
+                    // xquery/XQueryParser.g:1346:11: p_NamespaceNodeTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029);
-                    p_NamespaceNodeTest467=this.p_NamespaceNodeTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077);
+                    p_NamespaceNodeTest454=this.p_NamespaceNodeTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest467.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NamespaceNodeTest454.getTree());
 
 
                     break;
                 case 10 :
-                    // xquery/XQueryParser.g:1345:11: p_AnyKindTest
+                    // xquery/XQueryParser.g:1347:11: p_AnyKindTest
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10041);
-                    p_AnyKindTest468=this.p_AnyKindTest();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyKindTest_in_p_KindTest10089);
+                    p_AnyKindTest455=this.p_AnyKindTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest468.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyKindTest455.getTree());
 
 
                     break;
@@ -21513,7 +21557,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1349:1: p_AnyKindTest : NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1351:1: p_AnyKindTest : NODE LPAREN RPAREN ;
     // $ANTLR start "p_AnyKindTest"
     p_AnyKindTest: function() {
         var retval = new XQueryParser.p_AnyKindTest_return();
@@ -21521,33 +21565,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NODE469 = null;
-        var LPAREN470 = null;
-        var RPAREN471 = null;
+        var NODE456 = null;
+        var LPAREN457 = null;
+        var RPAREN458 = null;
 
-        var NODE469_tree=null;
-        var LPAREN470_tree=null;
-        var RPAREN471_tree=null;
+        var NODE456_tree=null;
+        var LPAREN457_tree=null;
+        var RPAREN458_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1350:9: ( NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1350:11: NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1352:9: ( NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1352:11: NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NODE469=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10067); if (this.state.failed) return retval;
+            NODE456=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_AnyKindTest10115); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NODE469_tree = this.adaptor.create(NODE469);
-            this.adaptor.addChild(root_0, NODE469_tree);
+            NODE456_tree = this.adaptor.create(NODE456);
+            this.adaptor.addChild(root_0, NODE456_tree);
             }
-            LPAREN470=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10069); if (this.state.failed) return retval;
+            LPAREN457=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyKindTest10117); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN470_tree = this.adaptor.create(LPAREN470);
-            this.adaptor.addChild(root_0, LPAREN470_tree);
+            LPAREN457_tree = this.adaptor.create(LPAREN457);
+            this.adaptor.addChild(root_0, LPAREN457_tree);
             }
-            RPAREN471=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10071); if (this.state.failed) return retval;
+            RPAREN458=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyKindTest10119); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN471_tree = this.adaptor.create(RPAREN471);
-            this.adaptor.addChild(root_0, RPAREN471_tree);
+            RPAREN458_tree = this.adaptor.create(RPAREN458);
+            this.adaptor.addChild(root_0, RPAREN458_tree);
             }
 
 
@@ -21585,7 +21629,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1354:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
+    // xquery/XQueryParser.g:1356:1: p_DocumentTest : DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN ;
     // $ANTLR start "p_DocumentTest"
     p_DocumentTest: function() {
         var retval = new XQueryParser.p_DocumentTest_return();
@@ -21593,32 +21637,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var DOCUMENT_NODE472 = null;
-        var LPAREN473 = null;
-        var RPAREN476 = null;
-         var p_ElementTest474 = null;
-         var p_SchemaElementTest475 = null;
+        var DOCUMENT_NODE459 = null;
+        var LPAREN460 = null;
+        var RPAREN463 = null;
+         var p_ElementTest461 = null;
+         var p_SchemaElementTest462 = null;
 
-        var DOCUMENT_NODE472_tree=null;
-        var LPAREN473_tree=null;
-        var RPAREN476_tree=null;
+        var DOCUMENT_NODE459_tree=null;
+        var LPAREN460_tree=null;
+        var RPAREN463_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1355:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
-            // xquery/XQueryParser.g:1355:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
+            // xquery/XQueryParser.g:1357:9: ( DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN )
+            // xquery/XQueryParser.g:1357:11: DOCUMENT_NODE LPAREN ( p_ElementTest | p_SchemaElementTest )? RPAREN
             root_0 = this.adaptor.nil();
 
-            DOCUMENT_NODE472=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097); if (this.state.failed) return retval;
+            DOCUMENT_NODE459=this.match(this.input,DOCUMENT_NODE,XQueryParser.FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            DOCUMENT_NODE472_tree = this.adaptor.create(DOCUMENT_NODE472);
-            this.adaptor.addChild(root_0, DOCUMENT_NODE472_tree);
+            DOCUMENT_NODE459_tree = this.adaptor.create(DOCUMENT_NODE459);
+            this.adaptor.addChild(root_0, DOCUMENT_NODE459_tree);
             }
-            LPAREN473=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10099); if (this.state.failed) return retval;
+            LPAREN460=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_DocumentTest10147); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN473_tree = this.adaptor.create(LPAREN473);
-            this.adaptor.addChild(root_0, LPAREN473_tree);
+            LPAREN460_tree = this.adaptor.create(LPAREN460);
+            this.adaptor.addChild(root_0, LPAREN460_tree);
             }
-            // xquery/XQueryParser.g:1355:32: ( p_ElementTest | p_SchemaElementTest )?
+            // xquery/XQueryParser.g:1357:32: ( p_ElementTest | p_SchemaElementTest )?
             var alt166=3;
             var LA166_0 = this.input.LA(1);
 
@@ -21630,34 +21674,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt166) {
                 case 1 :
-                    // xquery/XQueryParser.g:1355:33: p_ElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10102);
-                    p_ElementTest474=this.p_ElementTest();
+                    // xquery/XQueryParser.g:1357:33: p_ElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementTest_in_p_DocumentTest10150);
+                    p_ElementTest461=this.p_ElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest474.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementTest461.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1355:49: p_SchemaElementTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106);
-                    p_SchemaElementTest475=this.p_SchemaElementTest();
+                    // xquery/XQueryParser.g:1357:49: p_SchemaElementTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154);
+                    p_SchemaElementTest462=this.p_SchemaElementTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest475.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SchemaElementTest462.getTree());
 
 
                     break;
 
             }
 
-            RPAREN476=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10110); if (this.state.failed) return retval;
+            RPAREN463=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_DocumentTest10158); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN476_tree = this.adaptor.create(RPAREN476);
-            this.adaptor.addChild(root_0, RPAREN476_tree);
+            RPAREN463_tree = this.adaptor.create(RPAREN463);
+            this.adaptor.addChild(root_0, RPAREN463_tree);
             }
 
 
@@ -21695,7 +21739,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1359:1: p_TextTest : TEXT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1361:1: p_TextTest : TEXT LPAREN RPAREN ;
     // $ANTLR start "p_TextTest"
     p_TextTest: function() {
         var retval = new XQueryParser.p_TextTest_return();
@@ -21703,33 +21747,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var TEXT477 = null;
-        var LPAREN478 = null;
-        var RPAREN479 = null;
+        var TEXT464 = null;
+        var LPAREN465 = null;
+        var RPAREN466 = null;
 
-        var TEXT477_tree=null;
-        var LPAREN478_tree=null;
-        var RPAREN479_tree=null;
+        var TEXT464_tree=null;
+        var LPAREN465_tree=null;
+        var RPAREN466_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1360:9: ( TEXT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1360:11: TEXT LPAREN RPAREN
+            // xquery/XQueryParser.g:1362:9: ( TEXT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1362:11: TEXT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            TEXT477=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10136); if (this.state.failed) return retval;
+            TEXT464=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_TextTest10184); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            TEXT477_tree = this.adaptor.create(TEXT477);
-            this.adaptor.addChild(root_0, TEXT477_tree);
+            TEXT464_tree = this.adaptor.create(TEXT464);
+            this.adaptor.addChild(root_0, TEXT464_tree);
             }
-            LPAREN478=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10138); if (this.state.failed) return retval;
+            LPAREN465=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TextTest10186); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN478_tree = this.adaptor.create(LPAREN478);
-            this.adaptor.addChild(root_0, LPAREN478_tree);
+            LPAREN465_tree = this.adaptor.create(LPAREN465);
+            this.adaptor.addChild(root_0, LPAREN465_tree);
             }
-            RPAREN479=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10140); if (this.state.failed) return retval;
+            RPAREN466=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TextTest10188); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN479_tree = this.adaptor.create(RPAREN479);
-            this.adaptor.addChild(root_0, RPAREN479_tree);
+            RPAREN466_tree = this.adaptor.create(RPAREN466);
+            this.adaptor.addChild(root_0, RPAREN466_tree);
             }
 
 
@@ -21767,7 +21811,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1364:1: p_CommentTest : COMMENT LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1366:1: p_CommentTest : COMMENT LPAREN RPAREN ;
     // $ANTLR start "p_CommentTest"
     p_CommentTest: function() {
         var retval = new XQueryParser.p_CommentTest_return();
@@ -21775,33 +21819,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COMMENT480 = null;
-        var LPAREN481 = null;
-        var RPAREN482 = null;
+        var COMMENT467 = null;
+        var LPAREN468 = null;
+        var RPAREN469 = null;
 
-        var COMMENT480_tree=null;
-        var LPAREN481_tree=null;
-        var RPAREN482_tree=null;
+        var COMMENT467_tree=null;
+        var LPAREN468_tree=null;
+        var RPAREN469_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1365:9: ( COMMENT LPAREN RPAREN )
-            // xquery/XQueryParser.g:1365:11: COMMENT LPAREN RPAREN
+            // xquery/XQueryParser.g:1367:9: ( COMMENT LPAREN RPAREN )
+            // xquery/XQueryParser.g:1367:11: COMMENT LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            COMMENT480=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10166); if (this.state.failed) return retval;
+            COMMENT467=this.match(this.input,COMMENT,XQueryParser.FOLLOW_COMMENT_in_p_CommentTest10214); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            COMMENT480_tree = this.adaptor.create(COMMENT480);
-            this.adaptor.addChild(root_0, COMMENT480_tree);
+            COMMENT467_tree = this.adaptor.create(COMMENT467);
+            this.adaptor.addChild(root_0, COMMENT467_tree);
             }
-            LPAREN481=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10168); if (this.state.failed) return retval;
+            LPAREN468=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_CommentTest10216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN481_tree = this.adaptor.create(LPAREN481);
-            this.adaptor.addChild(root_0, LPAREN481_tree);
+            LPAREN468_tree = this.adaptor.create(LPAREN468);
+            this.adaptor.addChild(root_0, LPAREN468_tree);
             }
-            RPAREN482=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10170); if (this.state.failed) return retval;
+            RPAREN469=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_CommentTest10218); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN482_tree = this.adaptor.create(RPAREN482);
-            this.adaptor.addChild(root_0, RPAREN482_tree);
+            RPAREN469_tree = this.adaptor.create(RPAREN469);
+            this.adaptor.addChild(root_0, RPAREN469_tree);
             }
 
 
@@ -21839,7 +21883,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1369:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
+    // xquery/XQueryParser.g:1371:1: p_NamespaceNodeTest : NAMESPACE_NODE LPAREN RPAREN ;
     // $ANTLR start "p_NamespaceNodeTest"
     p_NamespaceNodeTest: function() {
         var retval = new XQueryParser.p_NamespaceNodeTest_return();
@@ -21847,33 +21891,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var NAMESPACE_NODE483 = null;
-        var LPAREN484 = null;
-        var RPAREN485 = null;
+        var NAMESPACE_NODE470 = null;
+        var LPAREN471 = null;
+        var RPAREN472 = null;
 
-        var NAMESPACE_NODE483_tree=null;
-        var LPAREN484_tree=null;
-        var RPAREN485_tree=null;
+        var NAMESPACE_NODE470_tree=null;
+        var LPAREN471_tree=null;
+        var RPAREN472_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1370:9: ( NAMESPACE_NODE LPAREN RPAREN )
-            // xquery/XQueryParser.g:1370:11: NAMESPACE_NODE LPAREN RPAREN
+            // xquery/XQueryParser.g:1372:9: ( NAMESPACE_NODE LPAREN RPAREN )
+            // xquery/XQueryParser.g:1372:11: NAMESPACE_NODE LPAREN RPAREN
             root_0 = this.adaptor.nil();
 
-            NAMESPACE_NODE483=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196); if (this.state.failed) return retval;
+            NAMESPACE_NODE470=this.match(this.input,NAMESPACE_NODE,XQueryParser.FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            NAMESPACE_NODE483_tree = this.adaptor.create(NAMESPACE_NODE483);
-            this.adaptor.addChild(root_0, NAMESPACE_NODE483_tree);
+            NAMESPACE_NODE470_tree = this.adaptor.create(NAMESPACE_NODE470);
+            this.adaptor.addChild(root_0, NAMESPACE_NODE470_tree);
             }
-            LPAREN484=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10198); if (this.state.failed) return retval;
+            LPAREN471=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_NamespaceNodeTest10246); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN484_tree = this.adaptor.create(LPAREN484);
-            this.adaptor.addChild(root_0, LPAREN484_tree);
+            LPAREN471_tree = this.adaptor.create(LPAREN471);
+            this.adaptor.addChild(root_0, LPAREN471_tree);
             }
-            RPAREN485=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10200); if (this.state.failed) return retval;
+            RPAREN472=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_NamespaceNodeTest10248); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN485_tree = this.adaptor.create(RPAREN485);
-            this.adaptor.addChild(root_0, RPAREN485_tree);
+            RPAREN472_tree = this.adaptor.create(RPAREN472);
+            this.adaptor.addChild(root_0, RPAREN472_tree);
             }
 
 
@@ -21911,7 +21955,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1374:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
+    // xquery/XQueryParser.g:1376:1: p_PITest : PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN ;
     // $ANTLR start "p_PITest"
     p_PITest: function() {
         var retval = new XQueryParser.p_PITest_return();
@@ -21919,32 +21963,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var PROCESSING_INSTRUCTION486 = null;
-        var LPAREN487 = null;
-        var RPAREN490 = null;
-         var p_NCName488 = null;
-         var p_StringLiteral489 = null;
+        var PROCESSING_INSTRUCTION473 = null;
+        var LPAREN474 = null;
+        var RPAREN477 = null;
+         var p_NCName475 = null;
+         var p_StringLiteral476 = null;
 
-        var PROCESSING_INSTRUCTION486_tree=null;
-        var LPAREN487_tree=null;
-        var RPAREN490_tree=null;
+        var PROCESSING_INSTRUCTION473_tree=null;
+        var LPAREN474_tree=null;
+        var RPAREN477_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1375:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
-            // xquery/XQueryParser.g:1375:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
+            // xquery/XQueryParser.g:1377:9: ( PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN )
+            // xquery/XQueryParser.g:1377:11: PROCESSING_INSTRUCTION LPAREN ( p_NCName | p_StringLiteral )? RPAREN
             root_0 = this.adaptor.nil();
 
-            PROCESSING_INSTRUCTION486=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226); if (this.state.failed) return retval;
+            PROCESSING_INSTRUCTION473=this.match(this.input,PROCESSING_INSTRUCTION,XQueryParser.FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            PROCESSING_INSTRUCTION486_tree = this.adaptor.create(PROCESSING_INSTRUCTION486);
-            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION486_tree);
+            PROCESSING_INSTRUCTION473_tree = this.adaptor.create(PROCESSING_INSTRUCTION473);
+            this.adaptor.addChild(root_0, PROCESSING_INSTRUCTION473_tree);
             }
-            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10228); if (this.state.failed) return retval;
+            LPAREN474=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_PITest10276); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN487_tree = this.adaptor.create(LPAREN487);
-            this.adaptor.addChild(root_0, LPAREN487_tree);
+            LPAREN474_tree = this.adaptor.create(LPAREN474);
+            this.adaptor.addChild(root_0, LPAREN474_tree);
             }
-            // xquery/XQueryParser.g:1375:41: ( p_NCName | p_StringLiteral )?
+            // xquery/XQueryParser.g:1377:41: ( p_NCName | p_StringLiteral )?
             var alt167=3;
             var LA167_0 = this.input.LA(1);
 
@@ -21956,34 +22000,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt167) {
                 case 1 :
-                    // xquery/XQueryParser.g:1375:42: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10231);
-                    p_NCName488=this.p_NCName();
+                    // xquery/XQueryParser.g:1377:42: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_PITest10279);
+                    p_NCName475=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName488.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NCName475.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1375:53: p_StringLiteral
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10235);
-                    p_StringLiteral489=this.p_StringLiteral();
+                    // xquery/XQueryParser.g:1377:53: p_StringLiteral
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_PITest10283);
+                    p_StringLiteral476=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral489.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral476.getTree());
 
 
                     break;
 
             }
 
-            RPAREN490=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10239); if (this.state.failed) return retval;
+            RPAREN477=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_PITest10287); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN490_tree = this.adaptor.create(RPAREN490);
-            this.adaptor.addChild(root_0, RPAREN490_tree);
+            RPAREN477_tree = this.adaptor.create(RPAREN477);
+            this.adaptor.addChild(root_0, RPAREN477_tree);
             }
 
 
@@ -22021,7 +22065,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1379:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
+    // xquery/XQueryParser.g:1381:1: p_AttributeTest : ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN ;
     // $ANTLR start "p_AttributeTest"
     p_AttributeTest: function() {
         var retval = new XQueryParser.p_AttributeTest_return();
@@ -22029,34 +22073,34 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ATTRIBUTE491 = null;
-        var LPAREN492 = null;
-        var COMMA494 = null;
-        var RPAREN496 = null;
-         var p_AttribNameOrWildcard493 = null;
-         var p_TypeName495 = null;
+        var ATTRIBUTE478 = null;
+        var LPAREN479 = null;
+        var COMMA481 = null;
+        var RPAREN483 = null;
+         var p_AttribNameOrWildcard480 = null;
+         var p_TypeName482 = null;
 
-        var ATTRIBUTE491_tree=null;
-        var LPAREN492_tree=null;
-        var COMMA494_tree=null;
-        var RPAREN496_tree=null;
+        var ATTRIBUTE478_tree=null;
+        var LPAREN479_tree=null;
+        var COMMA481_tree=null;
+        var RPAREN483_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1380:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
-            // xquery/XQueryParser.g:1380:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
+            // xquery/XQueryParser.g:1382:9: ( ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN )
+            // xquery/XQueryParser.g:1382:11: ATTRIBUTE LPAREN ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ATTRIBUTE491=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10265); if (this.state.failed) return retval;
+            ATTRIBUTE478=this.match(this.input,ATTRIBUTE,XQueryParser.FOLLOW_ATTRIBUTE_in_p_AttributeTest10313); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ATTRIBUTE491_tree = this.adaptor.create(ATTRIBUTE491);
-            this.adaptor.addChild(root_0, ATTRIBUTE491_tree);
+            ATTRIBUTE478_tree = this.adaptor.create(ATTRIBUTE478);
+            this.adaptor.addChild(root_0, ATTRIBUTE478_tree);
             }
-            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10267); if (this.state.failed) return retval;
+            LPAREN479=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AttributeTest10315); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN492_tree = this.adaptor.create(LPAREN492);
-            this.adaptor.addChild(root_0, LPAREN492_tree);
+            LPAREN479_tree = this.adaptor.create(LPAREN479);
+            this.adaptor.addChild(root_0, LPAREN479_tree);
             }
-            // xquery/XQueryParser.g:1380:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
+            // xquery/XQueryParser.g:1382:28: ( p_AttribNameOrWildcard ( COMMA p_TypeName )? )?
             var alt169=2;
             var LA169_0 = this.input.LA(1);
 
@@ -22065,14 +22109,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt169) {
                 case 1 :
-                    // xquery/XQueryParser.g:1380:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270);
-                    p_AttribNameOrWildcard493=this.p_AttribNameOrWildcard();
+                    // xquery/XQueryParser.g:1382:29: p_AttribNameOrWildcard ( COMMA p_TypeName )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318);
+                    p_AttribNameOrWildcard480=this.p_AttribNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard493.getTree());
-                    // xquery/XQueryParser.g:1380:52: ( COMMA p_TypeName )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttribNameOrWildcard480.getTree());
+                    // xquery/XQueryParser.g:1382:52: ( COMMA p_TypeName )?
                     var alt168=2;
                     var LA168_0 = this.input.LA(1);
 
@@ -22081,18 +22125,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt168) {
                         case 1 :
-                            // xquery/XQueryParser.g:1380:53: COMMA p_TypeName
-                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10273); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1382:53: COMMA p_TypeName
+                            COMMA481=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_AttributeTest10321); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA494_tree = this.adaptor.create(COMMA494);
-                            this.adaptor.addChild(root_0, COMMA494_tree);
+                            COMMA481_tree = this.adaptor.create(COMMA481);
+                            this.adaptor.addChild(root_0, COMMA481_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10275);
-                            p_TypeName495=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_AttributeTest10323);
+                            p_TypeName482=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName482.getTree());
 
 
                             break;
@@ -22105,10 +22149,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN496=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10281); if (this.state.failed) return retval;
+            RPAREN483=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AttributeTest10329); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN496_tree = this.adaptor.create(RPAREN496);
-            this.adaptor.addChild(root_0, RPAREN496_tree);
+            RPAREN483_tree = this.adaptor.create(RPAREN483);
+            this.adaptor.addChild(root_0, RPAREN483_tree);
             }
 
 
@@ -22146,7 +22190,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1384:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
+    // xquery/XQueryParser.g:1386:1: p_AttribNameOrWildcard : ( p_AttributeName | STAR );
     // $ANTLR start "p_AttribNameOrWildcard"
     p_AttribNameOrWildcard: function() {
         var retval = new XQueryParser.p_AttribNameOrWildcard_return();
@@ -22154,13 +22198,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR498 = null;
-         var p_AttributeName497 = null;
+        var STAR485 = null;
+         var p_AttributeName484 = null;
 
-        var STAR498_tree=null;
+        var STAR485_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1385:9: ( p_AttributeName | STAR )
+            // xquery/XQueryParser.g:1387:9: ( p_AttributeName | STAR )
             var alt170=2;
             var LA170_0 = this.input.LA(1);
 
@@ -22179,26 +22223,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt170) {
                 case 1 :
-                    // xquery/XQueryParser.g:1385:11: p_AttributeName
+                    // xquery/XQueryParser.g:1387:11: p_AttributeName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309);
-                    p_AttributeName497=this.p_AttributeName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357);
+                    p_AttributeName484=this.p_AttributeName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName497.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName484.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1385:29: STAR
+                    // xquery/XQueryParser.g:1387:29: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR498=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10313); if (this.state.failed) return retval;
+                    STAR485=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AttribNameOrWildcard10361); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR498_tree = this.adaptor.create(STAR498);
-                    this.adaptor.addChild(root_0, STAR498_tree);
+                    STAR485_tree = this.adaptor.create(STAR485);
+                    this.adaptor.addChild(root_0, STAR485_tree);
                     }
 
 
@@ -22238,7 +22282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1389:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1391:1: p_SchemaAttributeTest : SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN ;
     // $ANTLR start "p_SchemaAttributeTest"
     p_SchemaAttributeTest: function() {
         var retval = new XQueryParser.p_SchemaAttributeTest_return();
@@ -22246,40 +22290,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ATTRIBUTE499 = null;
-        var LPAREN500 = null;
-        var RPAREN502 = null;
-         var p_AttributeDeclaration501 = null;
+        var SCHEMA_ATTRIBUTE486 = null;
+        var LPAREN487 = null;
+        var RPAREN489 = null;
+         var p_AttributeDeclaration488 = null;
 
-        var SCHEMA_ATTRIBUTE499_tree=null;
-        var LPAREN500_tree=null;
-        var RPAREN502_tree=null;
+        var SCHEMA_ATTRIBUTE486_tree=null;
+        var LPAREN487_tree=null;
+        var RPAREN489_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1390:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
-            // xquery/XQueryParser.g:1390:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
+            // xquery/XQueryParser.g:1392:9: ( SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN )
+            // xquery/XQueryParser.g:1392:11: SCHEMA_ATTRIBUTE LPAREN p_AttributeDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ATTRIBUTE499=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339); if (this.state.failed) return retval;
+            SCHEMA_ATTRIBUTE486=this.match(this.input,SCHEMA_ATTRIBUTE,XQueryParser.FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ATTRIBUTE499_tree = this.adaptor.create(SCHEMA_ATTRIBUTE499);
-            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE499_tree);
+            SCHEMA_ATTRIBUTE486_tree = this.adaptor.create(SCHEMA_ATTRIBUTE486);
+            this.adaptor.addChild(root_0, SCHEMA_ATTRIBUTE486_tree);
             }
-            LPAREN500=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10341); if (this.state.failed) return retval;
+            LPAREN487=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaAttributeTest10389); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN500_tree = this.adaptor.create(LPAREN500);
-            this.adaptor.addChild(root_0, LPAREN500_tree);
+            LPAREN487_tree = this.adaptor.create(LPAREN487);
+            this.adaptor.addChild(root_0, LPAREN487_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343);
-            p_AttributeDeclaration501=this.p_AttributeDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391);
+            p_AttributeDeclaration488=this.p_AttributeDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration501.getTree());
-            RPAREN502=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10345); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeDeclaration488.getTree());
+            RPAREN489=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaAttributeTest10393); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN502_tree = this.adaptor.create(RPAREN502);
-            this.adaptor.addChild(root_0, RPAREN502_tree);
+            RPAREN489_tree = this.adaptor.create(RPAREN489);
+            this.adaptor.addChild(root_0, RPAREN489_tree);
             }
 
 
@@ -22317,7 +22361,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1394:1: p_AttributeDeclaration : p_AttributeName ;
+    // xquery/XQueryParser.g:1396:1: p_AttributeDeclaration : p_AttributeName ;
     // $ANTLR start "p_AttributeDeclaration"
     p_AttributeDeclaration: function() {
         var retval = new XQueryParser.p_AttributeDeclaration_return();
@@ -22325,20 +22369,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AttributeName503 = null;
+         var p_AttributeName490 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1395:9: ( p_AttributeName )
-            // xquery/XQueryParser.g:1395:11: p_AttributeName
+            // xquery/XQueryParser.g:1397:9: ( p_AttributeName )
+            // xquery/XQueryParser.g:1397:11: p_AttributeName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371);
-            p_AttributeName503=this.p_AttributeName();
+            this.pushFollow(XQueryParser.FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419);
+            p_AttributeName490=this.p_AttributeName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName503.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AttributeName490.getTree());
 
 
 
@@ -22375,7 +22419,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1399:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
+    // xquery/XQueryParser.g:1401:1: p_ElementTest : ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN ;
     // $ANTLR start "p_ElementTest"
     p_ElementTest: function() {
         var retval = new XQueryParser.p_ElementTest_return();
@@ -22383,36 +22427,36 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var ELEMENT504 = null;
-        var LPAREN505 = null;
-        var COMMA507 = null;
-        var QUESTION509 = null;
-        var RPAREN510 = null;
-         var p_ElementNameOrWildcard506 = null;
-         var p_TypeName508 = null;
+        var ELEMENT491 = null;
+        var LPAREN492 = null;
+        var COMMA494 = null;
+        var QUESTION496 = null;
+        var RPAREN497 = null;
+         var p_ElementNameOrWildcard493 = null;
+         var p_TypeName495 = null;
 
-        var ELEMENT504_tree=null;
-        var LPAREN505_tree=null;
-        var COMMA507_tree=null;
-        var QUESTION509_tree=null;
-        var RPAREN510_tree=null;
+        var ELEMENT491_tree=null;
+        var LPAREN492_tree=null;
+        var COMMA494_tree=null;
+        var QUESTION496_tree=null;
+        var RPAREN497_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1400:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
-            // xquery/XQueryParser.g:1400:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
+            // xquery/XQueryParser.g:1402:9: ( ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN )
+            // xquery/XQueryParser.g:1402:11: ELEMENT LPAREN ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )? RPAREN
             root_0 = this.adaptor.nil();
 
-            ELEMENT504=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10397); if (this.state.failed) return retval;
+            ELEMENT491=this.match(this.input,ELEMENT,XQueryParser.FOLLOW_ELEMENT_in_p_ElementTest10445); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            ELEMENT504_tree = this.adaptor.create(ELEMENT504);
-            this.adaptor.addChild(root_0, ELEMENT504_tree);
+            ELEMENT491_tree = this.adaptor.create(ELEMENT491);
+            this.adaptor.addChild(root_0, ELEMENT491_tree);
             }
-            LPAREN505=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10399); if (this.state.failed) return retval;
+            LPAREN492=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ElementTest10447); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN505_tree = this.adaptor.create(LPAREN505);
-            this.adaptor.addChild(root_0, LPAREN505_tree);
+            LPAREN492_tree = this.adaptor.create(LPAREN492);
+            this.adaptor.addChild(root_0, LPAREN492_tree);
             }
-            // xquery/XQueryParser.g:1400:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
+            // xquery/XQueryParser.g:1402:26: ( p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )? )?
             var alt173=2;
             var LA173_0 = this.input.LA(1);
 
@@ -22421,14 +22465,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt173) {
                 case 1 :
-                    // xquery/XQueryParser.g:1400:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402);
-                    p_ElementNameOrWildcard506=this.p_ElementNameOrWildcard();
+                    // xquery/XQueryParser.g:1402:27: p_ElementNameOrWildcard ( COMMA p_TypeName ( QUESTION )? )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450);
+                    p_ElementNameOrWildcard493=this.p_ElementNameOrWildcard();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard506.getTree());
-                    // xquery/XQueryParser.g:1400:51: ( COMMA p_TypeName ( QUESTION )? )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementNameOrWildcard493.getTree());
+                    // xquery/XQueryParser.g:1402:51: ( COMMA p_TypeName ( QUESTION )? )?
                     var alt172=2;
                     var LA172_0 = this.input.LA(1);
 
@@ -22437,19 +22481,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt172) {
                         case 1 :
-                            // xquery/XQueryParser.g:1400:52: COMMA p_TypeName ( QUESTION )?
-                            COMMA507=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10405); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1402:52: COMMA p_TypeName ( QUESTION )?
+                            COMMA494=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_ElementTest10453); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA507_tree = this.adaptor.create(COMMA507);
-                            this.adaptor.addChild(root_0, COMMA507_tree);
+                            COMMA494_tree = this.adaptor.create(COMMA494);
+                            this.adaptor.addChild(root_0, COMMA494_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10407);
-                            p_TypeName508=this.p_TypeName();
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeName_in_p_ElementTest10455);
+                            p_TypeName495=this.p_TypeName();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName508.getTree());
-                            // xquery/XQueryParser.g:1400:69: ( QUESTION )?
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeName495.getTree());
+                            // xquery/XQueryParser.g:1402:69: ( QUESTION )?
                             var alt171=2;
                             var LA171_0 = this.input.LA(1);
 
@@ -22458,11 +22502,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt171) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1400:69: QUESTION
-                                    QUESTION509=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10409); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1402:69: QUESTION
+                                    QUESTION496=this.match(this.input,QUESTION,XQueryParser.FOLLOW_QUESTION_in_p_ElementTest10457); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
-                                    QUESTION509_tree = this.adaptor.create(QUESTION509);
-                                    this.adaptor.addChild(root_0, QUESTION509_tree);
+                                    QUESTION496_tree = this.adaptor.create(QUESTION496);
+                                    this.adaptor.addChild(root_0, QUESTION496_tree);
                                     }
 
 
@@ -22482,10 +22526,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN510=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10416); if (this.state.failed) return retval;
+            RPAREN497=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ElementTest10464); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN510_tree = this.adaptor.create(RPAREN510);
-            this.adaptor.addChild(root_0, RPAREN510_tree);
+            RPAREN497_tree = this.adaptor.create(RPAREN497);
+            this.adaptor.addChild(root_0, RPAREN497_tree);
             }
 
 
@@ -22523,7 +22567,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1404:1: p_ElementNameOrWildcard : ( p_QName | STAR );
+    // xquery/XQueryParser.g:1406:1: p_ElementNameOrWildcard : ( p_QName | STAR );
     // $ANTLR start "p_ElementNameOrWildcard"
     p_ElementNameOrWildcard: function() {
         var retval = new XQueryParser.p_ElementNameOrWildcard_return();
@@ -22531,13 +22575,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var STAR512 = null;
-         var p_QName511 = null;
+        var STAR499 = null;
+         var p_QName498 = null;
 
-        var STAR512_tree=null;
+        var STAR499_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1405:9: ( p_QName | STAR )
+            // xquery/XQueryParser.g:1407:9: ( p_QName | STAR )
             var alt174=2;
             var LA174_0 = this.input.LA(1);
 
@@ -22556,26 +22600,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt174) {
                 case 1 :
-                    // xquery/XQueryParser.g:1405:11: p_QName
+                    // xquery/XQueryParser.g:1407:11: p_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10442);
-                    p_QName511=this.p_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementNameOrWildcard10490);
+                    p_QName498=this.p_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName511.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName498.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1405:21: STAR
+                    // xquery/XQueryParser.g:1407:21: STAR
                     root_0 = this.adaptor.nil();
 
-                    STAR512=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10446); if (this.state.failed) return retval;
+                    STAR499=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_ElementNameOrWildcard10494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    STAR512_tree = this.adaptor.create(STAR512);
-                    this.adaptor.addChild(root_0, STAR512_tree);
+                    STAR499_tree = this.adaptor.create(STAR499);
+                    this.adaptor.addChild(root_0, STAR499_tree);
                     }
 
 
@@ -22615,7 +22659,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1408:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
+    // xquery/XQueryParser.g:1410:1: p_SchemaElementTest : SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN ;
     // $ANTLR start "p_SchemaElementTest"
     p_SchemaElementTest: function() {
         var retval = new XQueryParser.p_SchemaElementTest_return();
@@ -22623,40 +22667,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SCHEMA_ELEMENT513 = null;
-        var LPAREN514 = null;
-        var RPAREN516 = null;
-         var p_ElementDeclaration515 = null;
+        var SCHEMA_ELEMENT500 = null;
+        var LPAREN501 = null;
+        var RPAREN503 = null;
+         var p_ElementDeclaration502 = null;
 
-        var SCHEMA_ELEMENT513_tree=null;
-        var LPAREN514_tree=null;
-        var RPAREN516_tree=null;
+        var SCHEMA_ELEMENT500_tree=null;
+        var LPAREN501_tree=null;
+        var RPAREN503_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1409:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
-            // xquery/XQueryParser.g:1409:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
+            // xquery/XQueryParser.g:1411:9: ( SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN )
+            // xquery/XQueryParser.g:1411:11: SCHEMA_ELEMENT LPAREN p_ElementDeclaration RPAREN
             root_0 = this.adaptor.nil();
 
-            SCHEMA_ELEMENT513=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464); if (this.state.failed) return retval;
+            SCHEMA_ELEMENT500=this.match(this.input,SCHEMA_ELEMENT,XQueryParser.FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SCHEMA_ELEMENT513_tree = this.adaptor.create(SCHEMA_ELEMENT513);
-            this.adaptor.addChild(root_0, SCHEMA_ELEMENT513_tree);
+            SCHEMA_ELEMENT500_tree = this.adaptor.create(SCHEMA_ELEMENT500);
+            this.adaptor.addChild(root_0, SCHEMA_ELEMENT500_tree);
             }
-            LPAREN514=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10466); if (this.state.failed) return retval;
+            LPAREN501=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SchemaElementTest10514); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN514_tree = this.adaptor.create(LPAREN514);
-            this.adaptor.addChild(root_0, LPAREN514_tree);
+            LPAREN501_tree = this.adaptor.create(LPAREN501);
+            this.adaptor.addChild(root_0, LPAREN501_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468);
-            p_ElementDeclaration515=this.p_ElementDeclaration();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516);
+            p_ElementDeclaration502=this.p_ElementDeclaration();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration515.getTree());
-            RPAREN516=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10470); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementDeclaration502.getTree());
+            RPAREN503=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SchemaElementTest10518); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN516_tree = this.adaptor.create(RPAREN516);
-            this.adaptor.addChild(root_0, RPAREN516_tree);
+            RPAREN503_tree = this.adaptor.create(RPAREN503);
+            this.adaptor.addChild(root_0, RPAREN503_tree);
             }
 
 
@@ -22694,7 +22738,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1413:1: p_ElementDeclaration : p_ElementName ;
+    // xquery/XQueryParser.g:1415:1: p_ElementDeclaration : p_ElementName ;
     // $ANTLR start "p_ElementDeclaration"
     p_ElementDeclaration: function() {
         var retval = new XQueryParser.p_ElementDeclaration_return();
@@ -22702,20 +22746,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ElementName517 = null;
+         var p_ElementName504 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1414:9: ( p_ElementName )
-            // xquery/XQueryParser.g:1414:11: p_ElementName
+            // xquery/XQueryParser.g:1416:9: ( p_ElementName )
+            // xquery/XQueryParser.g:1416:11: p_ElementName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10496);
-            p_ElementName517=this.p_ElementName();
+            this.pushFollow(XQueryParser.FOLLOW_p_ElementName_in_p_ElementDeclaration10544);
+            p_ElementName504=this.p_ElementName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName517.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ElementName504.getTree());
 
 
 
@@ -22752,7 +22796,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1418:1: p_AttributeName : p_QName ;
+    // xquery/XQueryParser.g:1420:1: p_AttributeName : p_QName ;
     // $ANTLR start "p_AttributeName"
     p_AttributeName: function() {
         var retval = new XQueryParser.p_AttributeName_return();
@@ -22760,20 +22804,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName518 = null;
+         var p_QName505 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1419:9: ( p_QName )
-            // xquery/XQueryParser.g:1419:11: p_QName
+            // xquery/XQueryParser.g:1421:9: ( p_QName )
+            // xquery/XQueryParser.g:1421:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10522);
-            p_QName518=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AttributeName10570);
+            p_QName505=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName518.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName505.getTree());
 
 
 
@@ -22810,7 +22854,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1423:1: p_ElementName : p_QName ;
+    // xquery/XQueryParser.g:1425:1: p_ElementName : p_QName ;
     // $ANTLR start "p_ElementName"
     p_ElementName: function() {
         var retval = new XQueryParser.p_ElementName_return();
@@ -22818,20 +22862,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName519 = null;
+         var p_QName506 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1424:9: ( p_QName )
-            // xquery/XQueryParser.g:1424:11: p_QName
+            // xquery/XQueryParser.g:1426:9: ( p_QName )
+            // xquery/XQueryParser.g:1426:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10548);
-            p_QName519=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ElementName10596);
+            p_QName506=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName519.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName506.getTree());
 
 
 
@@ -22868,7 +22912,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1428:1: p_TypeName : p_QName ;
+    // xquery/XQueryParser.g:1430:1: p_TypeName : p_QName ;
     // $ANTLR start "p_TypeName"
     p_TypeName: function() {
         var retval = new XQueryParser.p_TypeName_return();
@@ -22876,20 +22920,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName520 = null;
+         var p_QName507 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1429:9: ( p_QName )
-            // xquery/XQueryParser.g:1429:11: p_QName
+            // xquery/XQueryParser.g:1431:9: ( p_QName )
+            // xquery/XQueryParser.g:1431:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10574);
-            p_QName520=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_TypeName10622);
+            p_QName507=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName520.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName507.getTree());
 
 
 
@@ -22926,7 +22970,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1433:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
+    // xquery/XQueryParser.g:1435:1: p_FunctionTest : ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) ;
     // $ANTLR start "p_FunctionTest"
     p_FunctionTest: function() {
         var retval = new XQueryParser.p_FunctionTest_return();
@@ -22934,17 +22978,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Annotation521 = null;
-         var p_AnyFunctionTest522 = null;
-         var p_TypedFunctionTest523 = null;
+         var p_Annotation508 = null;
+         var p_AnyFunctionTest509 = null;
+         var p_TypedFunctionTest510 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1434:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:9: ( ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest ) )
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )* ( p_AnyFunctionTest | p_TypedFunctionTest )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1434:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:1436:11: ( p_Annotation )*
             loop175:
             do {
                 var alt175=2;
@@ -22957,13 +23001,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt175) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10600);
-                    p_Annotation521=this.p_Annotation();
+                    // xquery/XQueryParser.g:1436:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_FunctionTest10648);
+                    p_Annotation508=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation521.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation508.getTree());
 
 
                     break;
@@ -22973,7 +23017,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            // xquery/XQueryParser.g:1434:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
+            // xquery/XQueryParser.g:1436:25: ( p_AnyFunctionTest | p_TypedFunctionTest )
             var alt176=2;
             var LA176_0 = this.input.LA(1);
 
@@ -23014,24 +23058,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt176) {
                 case 1 :
-                    // xquery/XQueryParser.g:1434:26: p_AnyFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604);
-                    p_AnyFunctionTest522=this.p_AnyFunctionTest();
+                    // xquery/XQueryParser.g:1436:26: p_AnyFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652);
+                    p_AnyFunctionTest509=this.p_AnyFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest522.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AnyFunctionTest509.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1434:46: p_TypedFunctionTest
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608);
-                    p_TypedFunctionTest523=this.p_TypedFunctionTest();
+                    // xquery/XQueryParser.g:1436:46: p_TypedFunctionTest
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656);
+                    p_TypedFunctionTest510=this.p_TypedFunctionTest();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest523.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypedFunctionTest510.getTree());
 
 
                     break;
@@ -23074,7 +23118,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1438:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
+    // xquery/XQueryParser.g:1440:1: p_AnyFunctionTest : FUNCTION LPAREN STAR RPAREN ;
     // $ANTLR start "p_AnyFunctionTest"
     p_AnyFunctionTest: function() {
         var retval = new XQueryParser.p_AnyFunctionTest_return();
@@ -23082,40 +23126,40 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION524 = null;
-        var LPAREN525 = null;
-        var STAR526 = null;
-        var RPAREN527 = null;
+        var FUNCTION511 = null;
+        var LPAREN512 = null;
+        var STAR513 = null;
+        var RPAREN514 = null;
 
-        var FUNCTION524_tree=null;
-        var LPAREN525_tree=null;
-        var STAR526_tree=null;
-        var RPAREN527_tree=null;
+        var FUNCTION511_tree=null;
+        var LPAREN512_tree=null;
+        var STAR513_tree=null;
+        var RPAREN514_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1439:9: ( FUNCTION LPAREN STAR RPAREN )
-            // xquery/XQueryParser.g:1439:11: FUNCTION LPAREN STAR RPAREN
+            // xquery/XQueryParser.g:1441:9: ( FUNCTION LPAREN STAR RPAREN )
+            // xquery/XQueryParser.g:1441:11: FUNCTION LPAREN STAR RPAREN
             root_0 = this.adaptor.nil();
 
-            FUNCTION524=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10635); if (this.state.failed) return retval;
+            FUNCTION511=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_AnyFunctionTest10683); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION524_tree = this.adaptor.create(FUNCTION524);
-            this.adaptor.addChild(root_0, FUNCTION524_tree);
+            FUNCTION511_tree = this.adaptor.create(FUNCTION511);
+            this.adaptor.addChild(root_0, FUNCTION511_tree);
             }
-            LPAREN525=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10637); if (this.state.failed) return retval;
+            LPAREN512=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_AnyFunctionTest10685); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN525_tree = this.adaptor.create(LPAREN525);
-            this.adaptor.addChild(root_0, LPAREN525_tree);
+            LPAREN512_tree = this.adaptor.create(LPAREN512);
+            this.adaptor.addChild(root_0, LPAREN512_tree);
             }
-            STAR526=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10639); if (this.state.failed) return retval;
+            STAR513=this.match(this.input,STAR,XQueryParser.FOLLOW_STAR_in_p_AnyFunctionTest10687); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            STAR526_tree = this.adaptor.create(STAR526);
-            this.adaptor.addChild(root_0, STAR526_tree);
+            STAR513_tree = this.adaptor.create(STAR513);
+            this.adaptor.addChild(root_0, STAR513_tree);
             }
-            RPAREN527=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10641); if (this.state.failed) return retval;
+            RPAREN514=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_AnyFunctionTest10689); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN527_tree = this.adaptor.create(RPAREN527);
-            this.adaptor.addChild(root_0, RPAREN527_tree);
+            RPAREN514_tree = this.adaptor.create(RPAREN514);
+            this.adaptor.addChild(root_0, RPAREN514_tree);
             }
 
 
@@ -23153,7 +23197,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1443:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
+    // xquery/XQueryParser.g:1445:1: p_TypedFunctionTest : FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType ;
     // $ANTLR start "p_TypedFunctionTest"
     p_TypedFunctionTest: function() {
         var retval = new XQueryParser.p_TypedFunctionTest_return();
@@ -23161,37 +23205,37 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var FUNCTION528 = null;
-        var LPAREN529 = null;
-        var COMMA531 = null;
-        var RPAREN533 = null;
-        var AS534 = null;
-         var p_SequenceType530 = null;
-         var p_SequenceType532 = null;
-         var p_SequenceType535 = null;
+        var FUNCTION515 = null;
+        var LPAREN516 = null;
+        var COMMA518 = null;
+        var RPAREN520 = null;
+        var AS521 = null;
+         var p_SequenceType517 = null;
+         var p_SequenceType519 = null;
+         var p_SequenceType522 = null;
 
-        var FUNCTION528_tree=null;
-        var LPAREN529_tree=null;
-        var COMMA531_tree=null;
-        var RPAREN533_tree=null;
-        var AS534_tree=null;
+        var FUNCTION515_tree=null;
+        var LPAREN516_tree=null;
+        var COMMA518_tree=null;
+        var RPAREN520_tree=null;
+        var AS521_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1444:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
-            // xquery/XQueryParser.g:1444:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
+            // xquery/XQueryParser.g:1446:9: ( FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType )
+            // xquery/XQueryParser.g:1446:11: FUNCTION LPAREN ( p_SequenceType ( COMMA p_SequenceType )* )? RPAREN AS p_SequenceType
             root_0 = this.adaptor.nil();
 
-            FUNCTION528=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10667); if (this.state.failed) return retval;
+            FUNCTION515=this.match(this.input,FUNCTION,XQueryParser.FOLLOW_FUNCTION_in_p_TypedFunctionTest10715); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            FUNCTION528_tree = this.adaptor.create(FUNCTION528);
-            this.adaptor.addChild(root_0, FUNCTION528_tree);
+            FUNCTION515_tree = this.adaptor.create(FUNCTION515);
+            this.adaptor.addChild(root_0, FUNCTION515_tree);
             }
-            LPAREN529=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10669); if (this.state.failed) return retval;
+            LPAREN516=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypedFunctionTest10717); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN529_tree = this.adaptor.create(LPAREN529);
-            this.adaptor.addChild(root_0, LPAREN529_tree);
+            LPAREN516_tree = this.adaptor.create(LPAREN516);
+            this.adaptor.addChild(root_0, LPAREN516_tree);
             }
-            // xquery/XQueryParser.g:1444:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
+            // xquery/XQueryParser.g:1446:27: ( p_SequenceType ( COMMA p_SequenceType )* )?
             var alt178=2;
             var LA178_0 = this.input.LA(1);
 
@@ -23200,14 +23244,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt178) {
                 case 1 :
-                    // xquery/XQueryParser.g:1444:28: p_SequenceType ( COMMA p_SequenceType )*
-                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672);
-                    p_SequenceType530=this.p_SequenceType();
+                    // xquery/XQueryParser.g:1446:28: p_SequenceType ( COMMA p_SequenceType )*
+                    this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720);
+                    p_SequenceType517=this.p_SequenceType();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType530.getTree());
-                    // xquery/XQueryParser.g:1444:43: ( COMMA p_SequenceType )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType517.getTree());
+                    // xquery/XQueryParser.g:1446:43: ( COMMA p_SequenceType )*
                     loop177:
                     do {
                         var alt177=2;
@@ -23220,18 +23264,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt177) {
                         case 1 :
-                            // xquery/XQueryParser.g:1444:44: COMMA p_SequenceType
-                            COMMA531=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10675); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1446:44: COMMA p_SequenceType
+                            COMMA518=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TypedFunctionTest10723); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA531_tree = this.adaptor.create(COMMA531);
-                            this.adaptor.addChild(root_0, COMMA531_tree);
+                            COMMA518_tree = this.adaptor.create(COMMA518);
+                            this.adaptor.addChild(root_0, COMMA518_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677);
-                            p_SequenceType532=this.p_SequenceType();
+                            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725);
+                            p_SequenceType519=this.p_SequenceType();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType532.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType519.getTree());
 
 
                             break;
@@ -23247,22 +23291,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            RPAREN533=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10683); if (this.state.failed) return retval;
+            RPAREN520=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypedFunctionTest10731); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN533_tree = this.adaptor.create(RPAREN533);
-            this.adaptor.addChild(root_0, RPAREN533_tree);
+            RPAREN520_tree = this.adaptor.create(RPAREN520);
+            this.adaptor.addChild(root_0, RPAREN520_tree);
             }
-            AS534=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10685); if (this.state.failed) return retval;
+            AS521=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_TypedFunctionTest10733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            AS534_tree = this.adaptor.create(AS534);
-            this.adaptor.addChild(root_0, AS534_tree);
+            AS521_tree = this.adaptor.create(AS521);
+            this.adaptor.addChild(root_0, AS521_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687);
-            p_SequenceType535=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735);
+            p_SequenceType522=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType535.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType522.getTree());
 
 
 
@@ -23299,7 +23343,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1448:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
+    // xquery/XQueryParser.g:1450:1: p_ParenthesizedItemType : LPAREN p_ItemType RPAREN ;
     // $ANTLR start "p_ParenthesizedItemType"
     p_ParenthesizedItemType: function() {
         var retval = new XQueryParser.p_ParenthesizedItemType_return();
@@ -23307,33 +23351,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN536 = null;
-        var RPAREN538 = null;
-         var p_ItemType537 = null;
+        var LPAREN523 = null;
+        var RPAREN525 = null;
+         var p_ItemType524 = null;
 
-        var LPAREN536_tree=null;
-        var RPAREN538_tree=null;
+        var LPAREN523_tree=null;
+        var RPAREN525_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1449:9: ( LPAREN p_ItemType RPAREN )
-            // xquery/XQueryParser.g:1449:11: LPAREN p_ItemType RPAREN
+            // xquery/XQueryParser.g:1451:9: ( LPAREN p_ItemType RPAREN )
+            // xquery/XQueryParser.g:1451:11: LPAREN p_ItemType RPAREN
             root_0 = this.adaptor.nil();
 
-            LPAREN536=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10713); if (this.state.failed) return retval;
+            LPAREN523=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_ParenthesizedItemType10761); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN536_tree = this.adaptor.create(LPAREN536);
-            this.adaptor.addChild(root_0, LPAREN536_tree);
+            LPAREN523_tree = this.adaptor.create(LPAREN523);
+            this.adaptor.addChild(root_0, LPAREN523_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715);
-            p_ItemType537=this.p_ItemType();
+            this.pushFollow(XQueryParser.FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763);
+            p_ItemType524=this.p_ItemType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType537.getTree());
-            RPAREN538=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10717); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ItemType524.getTree());
+            RPAREN525=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_ParenthesizedItemType10765); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN538_tree = this.adaptor.create(RPAREN538);
-            this.adaptor.addChild(root_0, RPAREN538_tree);
+            RPAREN525_tree = this.adaptor.create(RPAREN525);
+            this.adaptor.addChild(root_0, RPAREN525_tree);
             }
 
 
@@ -23371,7 +23415,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1478:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
+    // xquery/XQueryParser.g:1480:1: p_StringLiteral : ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) );
     // $ANTLR start "p_StringLiteral"
     p_StringLiteral: function() {
         var retval = new XQueryParser.p_StringLiteral_return();
@@ -23379,23 +23423,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var QUOT539 = null;
-        var QUOT541 = null;
-        var APOS542 = null;
-        var APOS544 = null;
-         var pg_QuotStringLiteralContent540 = null;
-         var pg_AposStringLiteralContent543 = null;
+        var QUOT526 = null;
+        var QUOT528 = null;
+        var APOS529 = null;
+        var APOS531 = null;
+         var pg_QuotStringLiteralContent527 = null;
+         var pg_AposStringLiteralContent530 = null;
 
-        var QUOT539_tree=null;
-        var QUOT541_tree=null;
-        var APOS542_tree=null;
-        var APOS544_tree=null;
+        var QUOT526_tree=null;
+        var QUOT528_tree=null;
+        var APOS529_tree=null;
+        var APOS531_tree=null;
         var stream_APOS=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token APOS");
         var stream_QUOT=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token QUOT");
         var stream_pg_QuotStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_QuotStringLiteralContent");
         var stream_pg_AposStringLiteralContent=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule pg_AposStringLiteralContent");
         try {
-            // xquery/XQueryParser.g:1479:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
+            // xquery/XQueryParser.g:1481:9: ( QUOT pg_QuotStringLiteralContent QUOT -> ^( StringLiteral ( pg_QuotStringLiteralContent )* ) | APOS pg_AposStringLiteralContent APOS -> ^( StringLiteral ( pg_AposStringLiteralContent )* ) )
             var alt179=2;
             var LA179_0 = this.input.LA(1);
 
@@ -23414,21 +23458,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt179) {
                 case 1 :
-                    // xquery/XQueryParser.g:1479:11: QUOT pg_QuotStringLiteralContent QUOT
-                    QUOT539=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10768); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT539);
+                    // xquery/XQueryParser.g:1481:11: QUOT pg_QuotStringLiteralContent QUOT
+                    QUOT526=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10816); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT526);
 
                     if ( this.state.backtracking===0 ) {
                        this.pushStringLexer(false);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772);
-                    pg_QuotStringLiteralContent540=this.pg_QuotStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820);
+                    pg_QuotStringLiteralContent527=this.pg_QuotStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent540.getTree());
-                    QUOT541=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10774); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT541);
+                    if ( this.state.backtracking===0 ) stream_pg_QuotStringLiteralContent.add(pg_QuotStringLiteralContent527.getTree());
+                    QUOT528=this.match(this.input,QUOT,XQueryParser.FOLLOW_QUOT_in_p_StringLiteral10822); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_QUOT.add(QUOT528);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -23446,14 +23490,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1480:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                    // 1482:17: -> ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1480:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_QuotStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1480:36: ( pg_QuotStringLiteralContent )*
+                        // xquery/XQueryParser.g:1482:36: ( pg_QuotStringLiteralContent )*
                         while ( stream_pg_QuotStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_QuotStringLiteralContent.nextTree());
 
@@ -23469,21 +23513,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1481:11: APOS pg_AposStringLiteralContent APOS
-                    APOS542=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10813); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS542);
+                    // xquery/XQueryParser.g:1483:11: APOS pg_AposStringLiteralContent APOS
+                    APOS529=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10861); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS529);
 
                     if ( this.state.backtracking===0 ) {
                       this.pushStringLexer(true);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817);
-                    pg_AposStringLiteralContent543=this.pg_AposStringLiteralContent();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865);
+                    pg_AposStringLiteralContent530=this.pg_AposStringLiteralContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent543.getTree());
-                    APOS544=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10819); if (this.state.failed) return retval; 
-                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS544);
+                    if ( this.state.backtracking===0 ) stream_pg_AposStringLiteralContent.add(pg_AposStringLiteralContent530.getTree());
+                    APOS531=this.match(this.input,APOS,XQueryParser.FOLLOW_APOS_in_p_StringLiteral10867); if (this.state.failed) return retval; 
+                    if ( this.state.backtracking===0 ) stream_APOS.add(APOS531);
 
                     if ( this.state.backtracking===0 ) {
                        this.popLexer(); 
@@ -23501,14 +23545,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1482:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                    // 1484:17: -> ^( StringLiteral ( pg_AposStringLiteralContent )* )
                     {
-                        // xquery/XQueryParser.g:1482:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
+                        // xquery/XQueryParser.g:1484:20: ^( StringLiteral ( pg_AposStringLiteralContent )* )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(StringLiteral, "StringLiteral"), root_1);
 
-                        // xquery/XQueryParser.g:1482:36: ( pg_AposStringLiteralContent )*
+                        // xquery/XQueryParser.g:1484:36: ( pg_AposStringLiteralContent )*
                         while ( stream_pg_AposStringLiteralContent.hasNext() ) {
                             this.adaptor.addChild(root_1, stream_pg_AposStringLiteralContent.nextTree());
 
@@ -23559,7 +23603,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1488:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
+    // xquery/XQueryParser.g:1490:1: pg_QuotStringLiteralContent : ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* ;
     // $ANTLR start "pg_QuotStringLiteralContent"
     pg_QuotStringLiteralContent: function() {
         var retval = new XQueryParser.pg_QuotStringLiteralContent_return();
@@ -23567,16 +23611,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set545 = null;
+        var set532 = null;
 
-        var set545_tree=null;
+        var set532_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1489:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:9: ( ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )* )
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1489:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
+            // xquery/XQueryParser.g:1491:11: ( ESCAPE_QUOT | L_CharRef | L_PredefinedEntityRef | ~ ( QUOT | AMP ) )*
             loop180:
             do {
                 var alt180=2;
@@ -23590,10 +23634,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt180) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set545=this.input.LT(1);
+                    set532=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=APOS)||(this.input.LA(1)>=NCNameStartChar && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set545));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set532));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -23647,7 +23691,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1496:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
+    // xquery/XQueryParser.g:1498:1: pg_AposStringLiteralContent : ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* ;
     // $ANTLR start "pg_AposStringLiteralContent"
     pg_AposStringLiteralContent: function() {
         var retval = new XQueryParser.pg_AposStringLiteralContent_return();
@@ -23655,16 +23699,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set546 = null;
+        var set533 = null;
 
-        var set546_tree=null;
+        var set533_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1497:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:9: ( ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )* )
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1497:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
+            // xquery/XQueryParser.g:1499:11: ( ESCAPE_APOS | L_CharRef | L_PredefinedEntityRef | ~ ( APOS | AMP ) )*
             loop181:
             do {
                 var alt181=2;
@@ -23678,10 +23722,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 switch (alt181) {
                 case 1 :
                     // xquery/XQueryParser.g:
-                    set546=this.input.LT(1);
+                    set533=this.input.LT(1);
                     if ( (this.input.LA(1)>=L_QuotAttrContentChar && this.input.LA(1)<=HASH)||(this.input.LA(1)>=COMMA && this.input.LA(1)<=CHARREF_HEX)||(this.input.LA(1)>=QUOT && this.input.LA(1)<=EXPLICITLY) ) {
                         this.input.consume();
-                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set546));
+                        if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set533));
                         this.state.errorRecovery=false;this.state.failed=false;
                     }
                     else {
@@ -23735,7 +23779,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1511:1: p_ElementContentChar : L_ElementContentChar ;
+    // xquery/XQueryParser.g:1513:1: p_ElementContentChar : L_ElementContentChar ;
     // $ANTLR start "p_ElementContentChar"
     p_ElementContentChar: function() {
         var retval = new XQueryParser.p_ElementContentChar_return();
@@ -23743,19 +23787,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_ElementContentChar547 = null;
+        var L_ElementContentChar534 = null;
 
-        var L_ElementContentChar547_tree=null;
+        var L_ElementContentChar534_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1512:9: ( L_ElementContentChar )
-            // xquery/XQueryParser.g:1512:11: L_ElementContentChar
+            // xquery/XQueryParser.g:1514:9: ( L_ElementContentChar )
+            // xquery/XQueryParser.g:1514:11: L_ElementContentChar
             root_0 = this.adaptor.nil();
 
-            L_ElementContentChar547=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994); if (this.state.failed) return retval;
+            L_ElementContentChar534=this.match(this.input,L_ElementContentChar,XQueryParser.FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            L_ElementContentChar547_tree = this.adaptor.create(L_ElementContentChar547);
-            this.adaptor.addChild(root_0, L_ElementContentChar547_tree);
+            L_ElementContentChar534_tree = this.adaptor.create(L_ElementContentChar534);
+            this.adaptor.addChild(root_0, L_ElementContentChar534_tree);
             }
 
 
@@ -23793,7 +23837,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1516:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
+    // xquery/XQueryParser.g:1518:1: p_QuotAttrContentChar : L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) ;
     // $ANTLR start "p_QuotAttrContentChar"
     p_QuotAttrContentChar: function() {
         var retval = new XQueryParser.p_QuotAttrContentChar_return();
@@ -23801,16 +23845,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_QuotAttrContentChar548 = null;
+        var L_QuotAttrContentChar535 = null;
 
-        var L_QuotAttrContentChar548_tree=null;
+        var L_QuotAttrContentChar535_tree=null;
         var stream_L_QuotAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_QuotAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1517:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
-            // xquery/XQueryParser.g:1517:11: L_QuotAttrContentChar
-            L_QuotAttrContentChar548=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar548);
+            // xquery/XQueryParser.g:1519:9: ( L_QuotAttrContentChar -> ^( AttributeValueChar L_QuotAttrContentChar ) )
+            // xquery/XQueryParser.g:1519:11: L_QuotAttrContentChar
+            L_QuotAttrContentChar535=this.match(this.input,L_QuotAttrContentChar,XQueryParser.FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_QuotAttrContentChar.add(L_QuotAttrContentChar535);
 
 
 
@@ -23825,9 +23869,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1518:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
+            // 1520:17: -> ^( AttributeValueChar L_QuotAttrContentChar )
             {
-                // xquery/XQueryParser.g:1518:20: ^( AttributeValueChar L_QuotAttrContentChar )
+                // xquery/XQueryParser.g:1520:20: ^( AttributeValueChar L_QuotAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -23875,7 +23919,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1522:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
+    // xquery/XQueryParser.g:1524:1: p_AposAttrContentChar : L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) ;
     // $ANTLR start "p_AposAttrContentChar"
     p_AposAttrContentChar: function() {
         var retval = new XQueryParser.p_AposAttrContentChar_return();
@@ -23883,16 +23927,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_AposAttrContentChar549 = null;
+        var L_AposAttrContentChar536 = null;
 
-        var L_AposAttrContentChar549_tree=null;
+        var L_AposAttrContentChar536_tree=null;
         var stream_L_AposAttrContentChar=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token L_AposAttrContentChar");
 
         try {
-            // xquery/XQueryParser.g:1523:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
-            // xquery/XQueryParser.g:1523:11: L_AposAttrContentChar
-            L_AposAttrContentChar549=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar549);
+            // xquery/XQueryParser.g:1525:9: ( L_AposAttrContentChar -> ^( AttributeValueChar L_AposAttrContentChar ) )
+            // xquery/XQueryParser.g:1525:11: L_AposAttrContentChar
+            L_AposAttrContentChar536=this.match(this.input,L_AposAttrContentChar,XQueryParser.FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_L_AposAttrContentChar.add(L_AposAttrContentChar536);
 
 
 
@@ -23907,9 +23951,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1524:17: -> ^( AttributeValueChar L_AposAttrContentChar )
+            // 1526:17: -> ^( AttributeValueChar L_AposAttrContentChar )
             {
-                // xquery/XQueryParser.g:1524:20: ^( AttributeValueChar L_AposAttrContentChar )
+                // xquery/XQueryParser.g:1526:20: ^( AttributeValueChar L_AposAttrContentChar )
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(AttributeValueChar, "AttributeValueChar"), root_1);
@@ -23957,7 +24001,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1542:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
+    // xquery/XQueryParser.g:1544:1: p_QName : ( pg_QName | p_NCName -> ^( QName p_NCName ) );
     // $ANTLR start "p_QName"
     p_QName: function() {
         var retval = new XQueryParser.p_QName_return();
@@ -23965,13 +24009,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName550 = null;
-         var p_NCName551 = null;
+         var pg_QName537 = null;
+         var p_NCName538 = null;
 
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         this.setWsExplicit(true);
         try {
-            // xquery/XQueryParser.g:1544:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
+            // xquery/XQueryParser.g:1546:9: ( pg_QName | p_NCName -> ^( QName p_NCName ) )
             var alt182=2;
             var LA182_0 = this.input.LA(1);
 
@@ -24001,26 +24045,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt182) {
                 case 1 :
-                    // xquery/XQueryParser.g:1544:11: pg_QName
+                    // xquery/XQueryParser.g:1546:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11156);
-                    pg_QName550=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_p_QName11204);
+                    pg_QName537=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName550.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName537.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1545:11: p_NCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11168);
-                    p_NCName551=this.p_NCName();
+                    // xquery/XQueryParser.g:1547:11: p_NCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_p_QName11216);
+                    p_NCName538=this.p_NCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName551.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_NCName.add(p_NCName538.getTree());
 
 
                     // AST REWRITE
@@ -24034,9 +24078,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1546:17: -> ^( QName p_NCName )
+                    // 1548:17: -> ^( QName p_NCName )
                     {
-                        // xquery/XQueryParser.g:1546:20: ^( QName p_NCName )
+                        // xquery/XQueryParser.g:1548:20: ^( QName p_NCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -24087,7 +24131,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1550:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
+    // xquery/XQueryParser.g:1552:1: pg_FQName : ( pg_QName | p_FNCName -> ^( QName p_FNCName ) );
     // $ANTLR start "pg_FQName"
     pg_FQName: function() {
         var retval = new XQueryParser.pg_FQName_return();
@@ -24095,12 +24139,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var pg_QName552 = null;
-         var p_FNCName553 = null;
+         var pg_QName539 = null;
+         var p_FNCName540 = null;
 
         var stream_p_FNCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_FNCName");
         try {
-            // xquery/XQueryParser.g:1551:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
+            // xquery/XQueryParser.g:1553:9: ( pg_QName | p_FNCName -> ^( QName p_FNCName ) )
             var alt183=2;
             switch ( this.input.LA(1) ) {
             case ANCESTOR:
@@ -24339,26 +24383,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt183) {
                 case 1 :
-                    // xquery/XQueryParser.g:1551:11: pg_QName
+                    // xquery/XQueryParser.g:1553:11: pg_QName
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11229);
-                    pg_QName552=this.pg_QName();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_QName_in_pg_FQName11277);
+                    pg_QName539=this.pg_QName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName552.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_QName539.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1552:11: p_FNCName
-                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11241);
-                    p_FNCName553=this.p_FNCName();
+                    // xquery/XQueryParser.g:1554:11: p_FNCName
+                    this.pushFollow(XQueryParser.FOLLOW_p_FNCName_in_pg_FQName11289);
+                    p_FNCName540=this.p_FNCName();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName553.getTree());
+                    if ( this.state.backtracking===0 ) stream_p_FNCName.add(p_FNCName540.getTree());
 
 
                     // AST REWRITE
@@ -24372,9 +24416,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     var stream_retval=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = this.adaptor.nil();
-                    // 1553:17: -> ^( QName p_FNCName )
+                    // 1555:17: -> ^( QName p_FNCName )
                     {
-                        // xquery/XQueryParser.g:1553:20: ^( QName p_FNCName )
+                        // xquery/XQueryParser.g:1555:20: ^( QName p_FNCName )
                         {
                         var root_1 = this.adaptor.nil();
                         root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -24424,7 +24468,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1555:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
+    // xquery/XQueryParser.g:1557:1: pg_QName : nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) ;
     // $ANTLR start "pg_QName"
     pg_QName: function() {
         var retval = new XQueryParser.pg_QName_return();
@@ -24432,26 +24476,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var COLON554 = null;
+        var COLON541 = null;
          var nn = null;
          var nl = null;
 
-        var COLON554_tree=null;
+        var COLON541_tree=null;
         var stream_COLON=new org.antlr.runtime.tree.RewriteRuleTokenStream(this.adaptor,"token COLON");
         var stream_p_NCName=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"rule p_NCName");
         try {
-            // xquery/XQueryParser.g:1556:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
-            // xquery/XQueryParser.g:1556:11: nn= p_NCName COLON nl= p_NCName
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11285);
+            // xquery/XQueryParser.g:1558:9: (nn= p_NCName COLON nl= p_NCName -> ^( QName $nn $nl) )
+            // xquery/XQueryParser.g:1558:11: nn= p_NCName COLON nl= p_NCName
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11333);
             nn=this.p_NCName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) stream_p_NCName.add(nn.getTree());
-            COLON554=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11287); if (this.state.failed) return retval; 
-            if ( this.state.backtracking===0 ) stream_COLON.add(COLON554);
+            COLON541=this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_pg_QName11335); if (this.state.failed) return retval; 
+            if ( this.state.backtracking===0 ) stream_COLON.add(COLON541);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11291);
+            this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_pg_QName11339);
             nl=this.p_NCName();
 
             this.state._fsp--;
@@ -24460,7 +24504,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
 
             // AST REWRITE
-            // elements: nl, nn
+            // elements: nn, nl
             // token labels: 
             // rule labels: retval, nn, nl
             // token list labels: 
@@ -24472,9 +24516,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             var stream_nl=new org.antlr.runtime.tree.RewriteRuleSubtreeStream(this.adaptor,"token nl",nl!=null?nl.tree:null);
 
             root_0 = this.adaptor.nil();
-            // 1557:17: -> ^( QName $nn $nl)
+            // 1559:17: -> ^( QName $nn $nl)
             {
-                // xquery/XQueryParser.g:1557:20: ^( QName $nn $nl)
+                // xquery/XQueryParser.g:1559:20: ^( QName $nn $nl)
                 {
                 var root_1 = this.adaptor.nil();
                 root_1 = this.adaptor.becomeRoot(this.adaptor.create(QName, "QName"), root_1);
@@ -24523,7 +24567,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1587:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1589:1: p_NCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_NCName"
     p_NCName: function() {
         var retval = new XQueryParser.p_NCName_return();
@@ -24531,19 +24575,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set555 = null;
+        var set542 = null;
 
-        var set555_tree=null;
+        var set542_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1588:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1590:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | ATTRIBUTE | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | COMMENT | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | DOCUMENT_NODE | ELEMENT | ELSE | EMPTY | EMPTY_SEQUENCE | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IF | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | ITEM | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | NODE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | PROCESSING_INSTRUCTION | RETURN | SATISFIES | SCHEMA | SCHEMA_ATTRIBUTE | SCHEMA_ELEMENT | SELF | SOME | STABLE | STRICT | STRIP | SWITCH | TEXT | THEN | TO | TREAT | TYPESWITCH | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAMESPACE_NODE | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | WHILE | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set555=this.input.LT(1);
+            set542=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=SKIP)||(this.input.LA(1)>=VALUE && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set555));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set542));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -24588,7 +24632,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1606:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
+    // xquery/XQueryParser.g:1608:1: p_FNCName : ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER );
     // $ANTLR start "p_FNCName"
     p_FNCName: function() {
         var retval = new XQueryParser.p_FNCName_return();
@@ -24596,19 +24640,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var set556 = null;
+        var set543 = null;
 
-        var set556_tree=null;
+        var set543_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1607:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
+            // xquery/XQueryParser.g:1609:9: ( L_NCName | ANCESTOR | ANCESTOR_OR_SELF | AND | AS | ASCENDING | AT | BASE_URI | BOUNDARY_SPACE | BY | CASE | CAST | CASTABLE | CHILD | COLLATION | CONSTRUCTION | COPY_NAMESPACES | DECLARE | DEFAULT | DESCENDANT | DESCENDANT_OR_SELF | DESCENDING | DIV | DOCUMENT | ELSE | EMPTY | ENCODING | EQ | EVERY | EXCEPT | EXTERNAL | FOLLOWING | FOLLOWING_SIBLING | FOR | FUNCTION | GE | GREATEST | GT | IDIV | IMPORT | IN | INHERIT | INSTANCE | INTERSECT | IS | LAX | LE | LEAST | LET | LT | MOD | MODULE | NAMESPACE | NE | NO_INHERIT | NO_PRESERVE | OF | OPTION | OR | ORDER | ORDERED | ORDERING | PARENT | PRECEDING | PRECEDING_SIBLING | PRESERVE | RETURN | SATISFIES | SCHEMA | SELF | SOME | STABLE | STRICT | STRIP | THEN | TO | TREAT | UNION | UNORDERED | VALIDATE | VARIABLE | VERSION | WHERE | XQUERY | ALLOWING | CATCH | CONTEXT | COUNT | DECIMAL_FORMAT | DECIMAL_SEPARATOR | DIGIT | END | GROUP | GROUPING_SEPARATOR | INFINITY | MINUS_SIGN | NAN | NEXT | ONLY | PATTERN_SEPARATOR | PERCENT | PER_MILLE | PREVIOUS | SLIDING | START | TRY | TUMBLING | TYPE | WHEN | WINDOW | ZERO_DIGIT | AFTER | BEFORE | COPY | DELETE | FIRST | INSERT | INTO | LAST | MODIFY | NODES | RENAME | REPLACE | REVALIDATION | SKIP | UPDATING | VALUE | WITH | ALL | ANY | CONTAINS | CONTENT | DIACRITICS | DIFFERENT | DISTANCE | ENTIRE | EXACTLY | FROM | FT_OPTION | FTAND | FTNOT | FTOR | INSENSITIVE | LANGUAGE | LEVELS | LOWERCASE | MOST | NO | NOT | OCCURS | PARAGRAPH | PARAGRAPHS | PHRASE | RELATIONSHIP | SAME | SCORE | SENSITIVE | SENTENCE | SENTENCES | STEMMING | STOP | THESAURUS | TIMES | UPPERCASE | USING | WEIGHT | WILDCARDS | WITHOUT | WORD | WORDS | BREAK | CONTINUE | EXIT | LOOP | RETURNING | CHECK | COLLECTION | CONSTRAINT | EXPLICITLY | FOREACH | FOREIGN | INDEX | INTEGRITY | KEY | ON | UNIQUE | BINARY | AMP_ER | APOS_ER | QUOT_ER )
             // xquery/XQueryParser.g:
             root_0 = this.adaptor.nil();
 
-            set556=this.input.LT(1);
+            set543=this.input.LT(1);
             if ( (this.input.LA(1)>=ANCESTOR && this.input.LA(1)<=AT)||(this.input.LA(1)>=BASE_URI && this.input.LA(1)<=COLLATION)||(this.input.LA(1)>=CONSTRUCTION && this.input.LA(1)<=DOCUMENT)||(this.input.LA(1)>=ELSE && this.input.LA(1)<=EMPTY)||(this.input.LA(1)>=ENCODING && this.input.LA(1)<=IDIV)||(this.input.LA(1)>=IMPORT && this.input.LA(1)<=IS)||(this.input.LA(1)>=LAX && this.input.LA(1)<=NO_PRESERVE)||(this.input.LA(1)>=OF && this.input.LA(1)<=PRESERVE)||(this.input.LA(1)>=RETURN && this.input.LA(1)<=SCHEMA)||(this.input.LA(1)>=SELF && this.input.LA(1)<=STRIP)||(this.input.LA(1)>=THEN && this.input.LA(1)<=TREAT)||(this.input.LA(1)>=UNION && this.input.LA(1)<=MINUS_SIGN)||(this.input.LA(1)>=NAN && this.input.LA(1)<=START)||(this.input.LA(1)>=TRY && this.input.LA(1)<=RETURNING)||(this.input.LA(1)>=CHECK && this.input.LA(1)<=QUOT_ER)||this.input.LA(1)==L_NCName||this.input.LA(1)==EXPLICITLY ) {
                 this.input.consume();
-                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set556));
+                if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, this.adaptor.create(set543));
                 this.state.errorRecovery=false;this.state.failed=false;
             }
             else {
@@ -24653,7 +24697,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1644:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
+    // xquery/XQueryParser.g:1646:1: pg_UpdateExpr : ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr );
     // $ANTLR start "pg_UpdateExpr"
     pg_UpdateExpr: function() {
         var retval = new XQueryParser.pg_UpdateExpr_return();
@@ -24661,15 +24705,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InsertExpr557 = null;
-         var p_DeleteExpr558 = null;
-         var p_RenameExpr559 = null;
-         var p_ReplaceExpr560 = null;
-         var p_TransformExpr561 = null;
+         var p_InsertExpr544 = null;
+         var p_DeleteExpr545 = null;
+         var p_RenameExpr546 = null;
+         var p_ReplaceExpr547 = null;
+         var p_TransformExpr548 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1645:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
+            // xquery/XQueryParser.g:1647:9: ( p_InsertExpr | p_DeleteExpr | p_RenameExpr | p_ReplaceExpr | p_TransformExpr )
             var alt184=5;
             switch ( this.input.LA(1) ) {
             case INSERT:
@@ -24697,67 +24741,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt184) {
                 case 1 :
-                    // xquery/XQueryParser.g:1645:11: p_InsertExpr
+                    // xquery/XQueryParser.g:1647:11: p_InsertExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282);
-                    p_InsertExpr557=this.p_InsertExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330);
+                    p_InsertExpr544=this.p_InsertExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr557.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExpr544.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1646:11: p_DeleteExpr
+                    // xquery/XQueryParser.g:1648:11: p_DeleteExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294);
-                    p_DeleteExpr558=this.p_DeleteExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342);
+                    p_DeleteExpr545=this.p_DeleteExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr558.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_DeleteExpr545.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1647:11: p_RenameExpr
+                    // xquery/XQueryParser.g:1649:11: p_RenameExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306);
-                    p_RenameExpr559=this.p_RenameExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354);
+                    p_RenameExpr546=this.p_RenameExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr559.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_RenameExpr546.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1648:11: p_ReplaceExpr
+                    // xquery/XQueryParser.g:1650:11: p_ReplaceExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318);
-                    p_ReplaceExpr560=this.p_ReplaceExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366);
+                    p_ReplaceExpr547=this.p_ReplaceExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr560.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReplaceExpr547.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1649:11: p_TransformExpr
+                    // xquery/XQueryParser.g:1651:11: p_TransformExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330);
-                    p_TransformExpr561=this.p_TransformExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378);
+                    p_TransformExpr548=this.p_TransformExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr561.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TransformExpr548.getTree());
 
 
                     break;
@@ -24796,7 +24840,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1653:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
+    // xquery/XQueryParser.g:1655:1: pm_RevalidationDecl : k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON ;
     // $ANTLR start "pm_RevalidationDecl"
     pm_RevalidationDecl: function() {
         var retval = new XQueryParser.pm_RevalidationDecl_return();
@@ -24804,19 +24848,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON562 = null;
+        var SEMICOLON549 = null;
         var k = null;
         var list_k=null;
 
-        var SEMICOLON562_tree=null;
+        var SEMICOLON549_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1654:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
-            // xquery/XQueryParser.g:1654:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
+            // xquery/XQueryParser.g:1656:9: (k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON )
+            // xquery/XQueryParser.g:1656:11: k+= DECLARE k+= REVALIDATION (k+= STRICT | k+= LAX | k+= SKIP ) SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13358); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_RevalidationDecl13406); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -24824,7 +24868,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362); if (this.state.failed) return retval;
+            k=this.match(this.input,REVALIDATION,XQueryParser.FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -24832,7 +24876,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1654:38: (k+= STRICT | k+= LAX | k+= SKIP )
+            // xquery/XQueryParser.g:1656:38: (k+= STRICT | k+= LAX | k+= SKIP )
             var alt185=3;
             switch ( this.input.LA(1) ) {
             case STRICT:
@@ -24854,8 +24898,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt185) {
                 case 1 :
-                    // xquery/XQueryParser.g:1654:39: k+= STRICT
-                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:39: k+= STRICT
+                    k=this.match(this.input,STRICT,XQueryParser.FOLLOW_STRICT_in_pm_RevalidationDecl13415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -24867,8 +24911,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1654:51: k+= LAX
-                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13373); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:51: k+= LAX
+                    k=this.match(this.input,LAX,XQueryParser.FOLLOW_LAX_in_pm_RevalidationDecl13421); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -24880,8 +24924,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1654:60: k+= SKIP
-                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13379); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1656:60: k+= SKIP
+                    k=this.match(this.input,SKIP,XQueryParser.FOLLOW_SKIP_in_pm_RevalidationDecl13427); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -24898,10 +24942,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            SEMICOLON562=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384); if (this.state.failed) return retval;
+            SEMICOLON549=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON562_tree = this.adaptor.create(SEMICOLON562);
-            this.adaptor.addChild(root_0, SEMICOLON562_tree);
+            SEMICOLON549_tree = this.adaptor.create(SEMICOLON549);
+            this.adaptor.addChild(root_0, SEMICOLON549_tree);
             }
 
 
@@ -24939,7 +24983,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1658:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
+    // xquery/XQueryParser.g:1660:1: p_InsertExprTargetChoice : ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE );
     // $ANTLR start "p_InsertExprTargetChoice"
     p_InsertExprTargetChoice: function() {
         var retval = new XQueryParser.p_InsertExprTargetChoice_return();
@@ -24957,7 +25001,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1659:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
+            // xquery/XQueryParser.g:1661:9: ( ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO ) | ka= AFTER | kb= BEFORE )
             var alt188=3;
             switch ( this.input.LA(1) ) {
             case AS:
@@ -24980,12 +25024,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt188) {
                 case 1 :
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1659:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
-                    // xquery/XQueryParser.g:1659:12: (k+= AS (k+= FIRST | k+= LAST ) )?
+                    // xquery/XQueryParser.g:1661:11: ( (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO )
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )? k+= INTO
+                    // xquery/XQueryParser.g:1661:12: (k+= AS (k+= FIRST | k+= LAST ) )?
                     var alt187=2;
                     var LA187_0 = this.input.LA(1);
 
@@ -24994,8 +25038,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt187) {
                         case 1 :
-                            // xquery/XQueryParser.g:1659:13: k+= AS (k+= FIRST | k+= LAST )
-                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13414); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1661:13: k+= AS (k+= FIRST | k+= LAST )
+                            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_InsertExprTargetChoice13462); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -25003,7 +25047,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             if (org.antlr.lang.isNull(list_k)) list_k = [];
                             list_k.push(k);
 
-                            // xquery/XQueryParser.g:1659:19: (k+= FIRST | k+= LAST )
+                            // xquery/XQueryParser.g:1661:19: (k+= FIRST | k+= LAST )
                             var alt186=2;
                             var LA186_0 = this.input.LA(1);
 
@@ -25022,8 +25066,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                             }
                             switch (alt186) {
                                 case 1 :
-                                    // xquery/XQueryParser.g:1659:20: k+= FIRST
-                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13419); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:20: k+= FIRST
+                                    k=this.match(this.input,FIRST,XQueryParser.FOLLOW_FIRST_in_p_InsertExprTargetChoice13467); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -25035,8 +25079,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                                     break;
                                 case 2 :
-                                    // xquery/XQueryParser.g:1659:31: k+= LAST
-                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13425); if (this.state.failed) return retval;
+                                    // xquery/XQueryParser.g:1661:31: k+= LAST
+                                    k=this.match(this.input,LAST,XQueryParser.FOLLOW_LAST_in_p_InsertExprTargetChoice13473); if (this.state.failed) return retval;
                                     if ( this.state.backtracking===0 ) {
                                     k_tree = this.adaptor.create(k);
                                     this.adaptor.addChild(root_0, k_tree);
@@ -25056,7 +25100,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13432); if (this.state.failed) return retval;
+                    k=this.match(this.input,INTO,XQueryParser.FOLLOW_INTO_in_p_InsertExprTargetChoice13480); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25074,10 +25118,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1660:11: ka= AFTER
+                    // xquery/XQueryParser.g:1662:11: ka= AFTER
                     root_0 = this.adaptor.nil();
 
-                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13449); if (this.state.failed) return retval;
+                    ka=this.match(this.input,AFTER,XQueryParser.FOLLOW_AFTER_in_p_InsertExprTargetChoice13497); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -25089,10 +25133,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1661:11: kb= BEFORE
+                    // xquery/XQueryParser.g:1663:11: kb= BEFORE
                     root_0 = this.adaptor.nil();
 
-                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465); if (this.state.failed) return retval;
+                    kb=this.match(this.input,BEFORE,XQueryParser.FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kb_tree = this.adaptor.create(kb);
                     this.adaptor.addChild(root_0, kb_tree);
@@ -25138,7 +25182,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1665:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
+    // xquery/XQueryParser.g:1667:1: p_InsertExpr : k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr ;
     // $ANTLR start "p_InsertExpr"
     p_InsertExpr: function() {
         var retval = new XQueryParser.p_InsertExpr_return();
@@ -25148,18 +25192,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_SourceExpr563 = null;
-         var p_InsertExprTargetChoice564 = null;
-         var p_TargetExpr565 = null;
+         var p_SourceExpr550 = null;
+         var p_InsertExprTargetChoice551 = null;
+         var p_TargetExpr552 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1666:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
-            // xquery/XQueryParser.g:1666:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
+            // xquery/XQueryParser.g:1668:9: (k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr )
+            // xquery/XQueryParser.g:1668:11: k+= INSERT (k+= NODE | k+= NODES ) p_SourceExpr p_InsertExprTargetChoice p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13495); if (this.state.failed) return retval;
+            k=this.match(this.input,INSERT,XQueryParser.FOLLOW_INSERT_in_p_InsertExpr13543); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25167,7 +25211,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1666:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1668:21: (k+= NODE | k+= NODES )
             var alt189=2;
             var LA189_0 = this.input.LA(1);
 
@@ -25186,8 +25230,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt189) {
                 case 1 :
-                    // xquery/XQueryParser.g:1666:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13500); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_InsertExpr13548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25199,8 +25243,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1666:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13506); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1668:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_InsertExpr13554); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25214,24 +25258,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13509);
-            p_SourceExpr563=this.p_SourceExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_SourceExpr_in_p_InsertExpr13557);
+            p_SourceExpr550=this.p_SourceExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr563.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511);
-            p_InsertExprTargetChoice564=this.p_InsertExprTargetChoice();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SourceExpr550.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559);
+            p_InsertExprTargetChoice551=this.p_InsertExprTargetChoice();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice564.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13513);
-            p_TargetExpr565=this.p_TargetExpr();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InsertExprTargetChoice551.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_InsertExpr13561);
+            p_TargetExpr552=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr565.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr552.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -25271,7 +25315,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1670:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
+    // xquery/XQueryParser.g:1672:1: p_DeleteExpr : k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr ;
     // $ANTLR start "p_DeleteExpr"
     p_DeleteExpr: function() {
         var retval = new XQueryParser.p_DeleteExpr_return();
@@ -25281,16 +25325,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr566 = null;
+         var p_TargetExpr553 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1671:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
-            // xquery/XQueryParser.g:1671:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
+            // xquery/XQueryParser.g:1673:9: (k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr )
+            // xquery/XQueryParser.g:1673:11: k+= DELETE (k+= NODE | k+= NODES ) p_TargetExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13543); if (this.state.failed) return retval;
+            k=this.match(this.input,DELETE,XQueryParser.FOLLOW_DELETE_in_p_DeleteExpr13591); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25298,7 +25342,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1671:21: (k+= NODE | k+= NODES )
+            // xquery/XQueryParser.g:1673:21: (k+= NODE | k+= NODES )
             var alt190=2;
             var LA190_0 = this.input.LA(1);
 
@@ -25317,8 +25361,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt190) {
                 case 1 :
-                    // xquery/XQueryParser.g:1671:22: k+= NODE
-                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:22: k+= NODE
+                    k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_DeleteExpr13596); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25330,8 +25374,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1671:32: k+= NODES
-                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13554); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1673:32: k+= NODES
+                    k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_DeleteExpr13602); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25345,12 +25389,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13557);
-            p_TargetExpr566=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_DeleteExpr13605);
+            p_TargetExpr553=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr566.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr553.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -25390,7 +25434,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1675:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1677:1: p_ReplaceExpr : k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] ;
     // $ANTLR start "p_ReplaceExpr"
     p_ReplaceExpr: function() {
         var retval = new XQueryParser.p_ReplaceExpr_return();
@@ -25400,17 +25444,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_ExprSingle567 = null;
-         var p_ExprSingle568 = null;
+         var p_ExprSingle554 = null;
+         var p_ExprSingle555 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1676:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1676:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
+            // xquery/XQueryParser.g:1678:9: (k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1678:11: k+= REPLACE (k+= VALUE k+= OF )? k+= NODE p_ExprSingle[true] k+= WITH p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13587); if (this.state.failed) return retval;
+            k=this.match(this.input,REPLACE,XQueryParser.FOLLOW_REPLACE_in_p_ReplaceExpr13635); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25418,7 +25462,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            // xquery/XQueryParser.g:1676:22: (k+= VALUE k+= OF )?
+            // xquery/XQueryParser.g:1678:22: (k+= VALUE k+= OF )?
             var alt191=2;
             var LA191_0 = this.input.LA(1);
 
@@ -25427,8 +25471,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt191) {
                 case 1 :
-                    // xquery/XQueryParser.g:1676:23: k+= VALUE k+= OF
-                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13592); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1678:23: k+= VALUE k+= OF
+                    k=this.match(this.input,VALUE,XQueryParser.FOLLOW_VALUE_in_p_ReplaceExpr13640); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25436,7 +25480,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13596); if (this.state.failed) return retval;
+                    k=this.match(this.input,OF,XQueryParser.FOLLOW_OF_in_p_ReplaceExpr13644); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -25450,7 +25494,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13602); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ReplaceExpr13650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25458,13 +25502,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604);
-            p_ExprSingle567=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652);
+            p_ExprSingle554=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
-            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13609); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle554.getTree());
+            k=this.match(this.input,WITH,XQueryParser.FOLLOW_WITH_in_p_ReplaceExpr13657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25472,12 +25516,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611);
-            p_ExprSingle568=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659);
+            p_ExprSingle555=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle568.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle555.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -25517,7 +25561,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1680:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
+    // xquery/XQueryParser.g:1682:1: p_RenameExpr : k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr ;
     // $ANTLR start "p_RenameExpr"
     p_RenameExpr: function() {
         var retval = new XQueryParser.p_RenameExpr_return();
@@ -25527,17 +25571,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_TargetExpr569 = null;
-         var p_NewNameExpr570 = null;
+         var p_TargetExpr556 = null;
+         var p_NewNameExpr557 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1681:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
-            // xquery/XQueryParser.g:1681:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
+            // xquery/XQueryParser.g:1683:9: (k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr )
+            // xquery/XQueryParser.g:1683:11: k+= RENAME k+= NODE p_TargetExpr k+= AS p_NewNameExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13642); if (this.state.failed) return retval;
+            k=this.match(this.input,RENAME,XQueryParser.FOLLOW_RENAME_in_p_RenameExpr13690); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25545,7 +25589,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13646); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_RenameExpr13694); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25553,13 +25597,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13648);
-            p_TargetExpr569=this.p_TargetExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_TargetExpr_in_p_RenameExpr13696);
+            p_TargetExpr556=this.p_TargetExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr569.getTree());
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13652); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TargetExpr556.getTree());
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_RenameExpr13700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25567,12 +25611,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13654);
-            p_NewNameExpr570=this.p_NewNameExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_NewNameExpr_in_p_RenameExpr13702);
+            p_NewNameExpr557=this.p_NewNameExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr570.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_NewNameExpr557.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -25612,7 +25656,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1685:1: p_SourceExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1687:1: p_SourceExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_SourceExpr"
     p_SourceExpr: function() {
         var retval = new XQueryParser.p_SourceExpr_return();
@@ -25620,20 +25664,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle571 = null;
+         var p_ExprSingle558 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1686:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1686:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1688:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1688:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13682);
-            p_ExprSingle571=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_SourceExpr13730);
+            p_ExprSingle558=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle571.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle558.getTree());
 
 
 
@@ -25670,7 +25714,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1690:1: p_TargetExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1692:1: p_TargetExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_TargetExpr"
     p_TargetExpr: function() {
         var retval = new XQueryParser.p_TargetExpr_return();
@@ -25678,20 +25722,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle572 = null;
+         var p_ExprSingle559 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1691:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1691:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1693:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1693:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13709);
-            p_ExprSingle572=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TargetExpr13757);
+            p_ExprSingle559=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle572.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle559.getTree());
 
 
 
@@ -25728,7 +25772,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1695:1: p_NewNameExpr : p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1697:1: p_NewNameExpr : p_ExprSingle[true] ;
     // $ANTLR start "p_NewNameExpr"
     p_NewNameExpr: function() {
         var retval = new XQueryParser.p_NewNameExpr_return();
@@ -25736,20 +25780,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_ExprSingle573 = null;
+         var p_ExprSingle560 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1696:9: ( p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1696:11: p_ExprSingle[true]
+            // xquery/XQueryParser.g:1698:9: ( p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1698:11: p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13736);
-            p_ExprSingle573=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_NewNameExpr13784);
+            p_ExprSingle560=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle573.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle560.getTree());
 
 
 
@@ -25786,7 +25830,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1700:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:1702:1: p_TransformExpr : k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] ;
     // $ANTLR start "p_TransformExpr"
     p_TransformExpr: function() {
         var retval = new XQueryParser.p_TransformExpr_return();
@@ -25796,31 +25840,31 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var d = null;
         var e = null;
-        var BIND574 = null;
-        var COMMA576 = null;
-        var BIND577 = null;
+        var BIND561 = null;
+        var COMMA563 = null;
+        var BIND564 = null;
         var k = null;
         var list_k=null;
          var v = null;
          var w = null;
-         var p_ExprSingle575 = null;
-         var p_ExprSingle578 = null;
-         var p_ExprSingle579 = null;
-         var p_ExprSingle580 = null;
+         var p_ExprSingle562 = null;
+         var p_ExprSingle565 = null;
+         var p_ExprSingle566 = null;
+         var p_ExprSingle567 = null;
 
         var d_tree=null;
         var e_tree=null;
-        var BIND574_tree=null;
-        var COMMA576_tree=null;
-        var BIND577_tree=null;
+        var BIND561_tree=null;
+        var COMMA563_tree=null;
+        var BIND564_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1701:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
-            // xquery/XQueryParser.g:1701:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
+            // xquery/XQueryParser.g:1703:9: (k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true] )
+            // xquery/XQueryParser.g:1703:11: k+= COPY d= DOLLAR v= p_VarName BIND p_ExprSingle[true] ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )* k+= MODIFY p_ExprSingle[true] k+= RETURN p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13765); if (this.state.failed) return retval;
+            k=this.match(this.input,COPY,XQueryParser.FOLLOW_COPY_in_p_TransformExpr13813); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25828,12 +25872,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13769); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13817); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13773);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13821);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -25842,18 +25886,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND574=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13777); if (this.state.failed) return retval;
+            BIND561=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13825); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND574_tree = this.adaptor.create(BIND574);
-            this.adaptor.addChild(root_0, BIND574_tree);
+            BIND561_tree = this.adaptor.create(BIND561);
+            this.adaptor.addChild(root_0, BIND561_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13779);
-            p_ExprSingle575=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13827);
+            p_ExprSingle562=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle575.getTree());
-            // xquery/XQueryParser.g:1701:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle562.getTree());
+            // xquery/XQueryParser.g:1703:90: ( COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true] )*
             loop192:
             do {
                 var alt192=2;
@@ -25866,18 +25910,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt192) {
                 case 1 :
-                    // xquery/XQueryParser.g:1701:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
-                    COMMA576=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13783); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1703:91: COMMA e= DOLLAR w= p_VarName BIND p_ExprSingle[true]
+                    COMMA563=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_TransformExpr13831); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA576_tree = this.adaptor.create(COMMA576);
-                    this.adaptor.addChild(root_0, COMMA576_tree);
+                    COMMA563_tree = this.adaptor.create(COMMA563);
+                    this.adaptor.addChild(root_0, COMMA563_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13787); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TransformExpr13835); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13791);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TransformExpr13839);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -25886,17 +25930,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    BIND577=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13795); if (this.state.failed) return retval;
+                    BIND564=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_TransformExpr13843); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND577_tree = this.adaptor.create(BIND577);
-                    this.adaptor.addChild(root_0, BIND577_tree);
+                    BIND564_tree = this.adaptor.create(BIND564);
+                    this.adaptor.addChild(root_0, BIND564_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13797);
-                    p_ExprSingle578=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13845);
+                    p_ExprSingle565=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle578.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle565.getTree());
 
 
                     break;
@@ -25906,7 +25950,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13804); if (this.state.failed) return retval;
+            k=this.match(this.input,MODIFY,XQueryParser.FOLLOW_MODIFY_in_p_TransformExpr13852); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25914,13 +25958,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13806);
-            p_ExprSingle579=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13854);
+            p_ExprSingle566=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle579.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13811); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle566.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TransformExpr13859); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -25928,12 +25972,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13813);
-            p_ExprSingle580=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_TransformExpr13861);
+            p_ExprSingle567=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle580.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle567.getTree());
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
@@ -25973,7 +26017,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1711:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
+    // xquery/XQueryParser.g:1713:1: pm_FTOptionDecl : k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON ;
     // $ANTLR start "pm_FTOptionDecl"
     pm_FTOptionDecl: function() {
         var retval = new XQueryParser.pm_FTOptionDecl_return();
@@ -25981,20 +26025,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON582 = null;
+        var SEMICOLON569 = null;
         var k = null;
         var list_k=null;
-         var p_FTMatchOptions581 = null;
+         var p_FTMatchOptions568 = null;
 
-        var SEMICOLON582_tree=null;
+        var SEMICOLON569_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1712:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
-            // xquery/XQueryParser.g:1712:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
+            // xquery/XQueryParser.g:1714:9: (k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON )
+            // xquery/XQueryParser.g:1714:11: k+= DECLARE k+= FT_OPTION p_FTMatchOptions SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13851); if (this.state.failed) return retval;
+            k=this.match(this.input,DECLARE,XQueryParser.FOLLOW_DECLARE_in_pm_FTOptionDecl13899); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26002,7 +26046,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855); if (this.state.failed) return retval;
+            k=this.match(this.input,FT_OPTION,XQueryParser.FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -26010,16 +26054,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857);
-            p_FTMatchOptions581=this.p_FTMatchOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905);
+            p_FTMatchOptions568=this.p_FTMatchOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions581.getTree());
-            SEMICOLON582=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions568.getTree());
+            SEMICOLON569=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON582_tree = this.adaptor.create(SEMICOLON582);
-            this.adaptor.addChild(root_0, SEMICOLON582_tree);
+            SEMICOLON569_tree = this.adaptor.create(SEMICOLON569);
+            this.adaptor.addChild(root_0, SEMICOLON569_tree);
             }
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
@@ -26060,7 +26104,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1716:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
+    // xquery/XQueryParser.g:1718:1: p_FTScoreVar : ks= SCORE d= DOLLAR v= p_VarName ;
     // $ANTLR start "p_FTScoreVar"
     p_FTScoreVar: function() {
         var retval = new XQueryParser.p_FTScoreVar_return();
@@ -26076,11 +26120,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1717:9: (ks= SCORE d= DOLLAR v= p_VarName )
-            // xquery/XQueryParser.g:1717:11: ks= SCORE d= DOLLAR v= p_VarName
+            // xquery/XQueryParser.g:1719:9: (ks= SCORE d= DOLLAR v= p_VarName )
+            // xquery/XQueryParser.g:1719:11: ks= SCORE d= DOLLAR v= p_VarName
             root_0 = this.adaptor.nil();
 
-            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13889); if (this.state.failed) return retval;
+            ks=this.match(this.input,SCORE,XQueryParser.FOLLOW_SCORE_in_p_FTScoreVar13937); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ks_tree = this.adaptor.create(ks);
             this.adaptor.addChild(root_0, ks_tree);
@@ -26088,12 +26132,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ks);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13895); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_FTScoreVar13943); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13899);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_FTScoreVar13947);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -26138,7 +26182,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1721:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
+    // xquery/XQueryParser.g:1723:1: p_FTContainsExpr : p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? ;
     // $ANTLR start "p_FTContainsExpr"
     p_FTContainsExpr: function() {
         var retval = new XQueryParser.p_FTContainsExpr_return();
@@ -26148,24 +26192,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringConcatExpr583 = null;
-         var p_FTSelection584 = null;
-         var p_FTIgnoreOption585 = null;
+         var p_StringConcatExpr570 = null;
+         var p_FTSelection571 = null;
+         var p_FTIgnoreOption572 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1722:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
-            // xquery/XQueryParser.g:1722:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            // xquery/XQueryParser.g:1724:9: ( p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )? )
+            // xquery/XQueryParser.g:1724:11: p_StringConcatExpr (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927);
-            p_StringConcatExpr583=this.p_StringConcatExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975);
+            p_StringConcatExpr570=this.p_StringConcatExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr583.getTree());
-            // xquery/XQueryParser.g:1722:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringConcatExpr570.getTree());
+            // xquery/XQueryParser.g:1724:30: (k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )? )?
             var alt194=2;
             var LA194_0 = this.input.LA(1);
 
@@ -26174,8 +26218,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt194) {
                 case 1 :
-                    // xquery/XQueryParser.g:1722:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
-                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13933); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1724:32: k+= CONTAINS k+= TEXT p_FTSelection ( p_FTIgnoreOption )?
+                    k=this.match(this.input,CONTAINS,XQueryParser.FOLLOW_CONTAINS_in_p_FTContainsExpr13981); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -26183,7 +26227,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13937); if (this.state.failed) return retval;
+                    k=this.match(this.input,TEXT,XQueryParser.FOLLOW_TEXT_in_p_FTContainsExpr13985); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -26194,13 +26238,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13941);
-                    p_FTSelection584=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTContainsExpr13989);
+                    p_FTSelection571=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection584.getTree());
-                    // xquery/XQueryParser.g:1722:81: ( p_FTIgnoreOption )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection571.getTree());
+                    // xquery/XQueryParser.g:1724:81: ( p_FTIgnoreOption )?
                     var alt193=2;
                     var LA193_0 = this.input.LA(1);
 
@@ -26209,13 +26253,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt193) {
                         case 1 :
-                            // xquery/XQueryParser.g:1722:81: p_FTIgnoreOption
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943);
-                            p_FTIgnoreOption585=this.p_FTIgnoreOption();
+                            // xquery/XQueryParser.g:1724:81: p_FTIgnoreOption
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991);
+                            p_FTIgnoreOption572=this.p_FTIgnoreOption();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption585.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTIgnoreOption572.getTree());
 
 
                             break;
@@ -26264,7 +26308,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1726:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
+    // xquery/XQueryParser.g:1728:1: p_FTSelection : p_FTOr ( p_FTPosFilter )* ;
     // $ANTLR start "p_FTSelection"
     p_FTSelection: function() {
         var retval = new XQueryParser.p_FTSelection_return();
@@ -26272,22 +26316,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOr586 = null;
-         var p_FTPosFilter587 = null;
+         var p_FTOr573 = null;
+         var p_FTPosFilter574 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1727:9: ( p_FTOr ( p_FTPosFilter )* )
-            // xquery/XQueryParser.g:1727:11: p_FTOr ( p_FTPosFilter )*
+            // xquery/XQueryParser.g:1729:9: ( p_FTOr ( p_FTPosFilter )* )
+            // xquery/XQueryParser.g:1729:11: p_FTOr ( p_FTPosFilter )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection13973);
-            p_FTOr586=this.p_FTOr();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTOr_in_p_FTSelection14021);
+            p_FTOr573=this.p_FTOr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr586.getTree());
-            // xquery/XQueryParser.g:1727:18: ( p_FTPosFilter )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOr573.getTree());
+            // xquery/XQueryParser.g:1729:18: ( p_FTPosFilter )*
             loop195:
             do {
                 var alt195=2;
@@ -26300,13 +26344,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt195) {
                 case 1 :
-                    // xquery/XQueryParser.g:1727:18: p_FTPosFilter
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection13975);
-                    p_FTPosFilter587=this.p_FTPosFilter();
+                    // xquery/XQueryParser.g:1729:18: p_FTPosFilter
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTPosFilter_in_p_FTSelection14023);
+                    p_FTPosFilter574=this.p_FTPosFilter();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter587.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPosFilter574.getTree());
 
 
                     break;
@@ -26352,7 +26396,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1731:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
+    // xquery/XQueryParser.g:1733:1: p_FTWeight : kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET ;
     // $ANTLR start "p_FTWeight"
     p_FTWeight: function() {
         var retval = new XQueryParser.p_FTWeight_return();
@@ -26361,20 +26405,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-        var LBRACKET588 = null;
-        var RBRACKET590 = null;
-         var p_Expr589 = null;
+        var LBRACKET575 = null;
+        var RBRACKET577 = null;
+         var p_Expr576 = null;
 
         var kw_tree=null;
-        var LBRACKET588_tree=null;
-        var RBRACKET590_tree=null;
+        var LBRACKET575_tree=null;
+        var RBRACKET577_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1732:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
-            // xquery/XQueryParser.g:1732:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
+            // xquery/XQueryParser.g:1734:9: (kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET )
+            // xquery/XQueryParser.g:1734:11: kw= WEIGHT LBRACKET p_Expr[true,true] RBRACKET
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14004); if (this.state.failed) return retval;
+            kw=this.match(this.input,WEIGHT,XQueryParser.FOLLOW_WEIGHT_in_p_FTWeight14052); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -26382,21 +26426,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            LBRACKET588=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14008); if (this.state.failed) return retval;
+            LBRACKET575=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWeight14056); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET588_tree = this.adaptor.create(LBRACKET588);
-            this.adaptor.addChild(root_0, LBRACKET588_tree);
+            LBRACKET575_tree = this.adaptor.create(LBRACKET575);
+            this.adaptor.addChild(root_0, LBRACKET575_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14010);
-            p_Expr589=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWeight14058);
+            p_Expr576=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr589.getTree());
-            RBRACKET590=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14013); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr576.getTree());
+            RBRACKET577=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWeight14061); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET590_tree = this.adaptor.create(RBRACKET590);
-            this.adaptor.addChild(root_0, RBRACKET590_tree);
+            RBRACKET577_tree = this.adaptor.create(RBRACKET577);
+            this.adaptor.addChild(root_0, RBRACKET577_tree);
             }
 
 
@@ -26434,7 +26478,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1736:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
+    // xquery/XQueryParser.g:1738:1: p_FTOr : p_FTAnd (ko= FTOR p_FTAnd )* ;
     // $ANTLR start "p_FTOr"
     p_FTOr: function() {
         var retval = new XQueryParser.p_FTOr_return();
@@ -26443,23 +26487,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_FTAnd591 = null;
-         var p_FTAnd592 = null;
+         var p_FTAnd578 = null;
+         var p_FTAnd579 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1737:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
-            // xquery/XQueryParser.g:1737:11: p_FTAnd (ko= FTOR p_FTAnd )*
+            // xquery/XQueryParser.g:1739:9: ( p_FTAnd (ko= FTOR p_FTAnd )* )
+            // xquery/XQueryParser.g:1739:11: p_FTAnd (ko= FTOR p_FTAnd )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14039);
-            p_FTAnd591=this.p_FTAnd();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14087);
+            p_FTAnd578=this.p_FTAnd();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd591.getTree());
-            // xquery/XQueryParser.g:1737:19: (ko= FTOR p_FTAnd )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd578.getTree());
+            // xquery/XQueryParser.g:1739:19: (ko= FTOR p_FTAnd )*
             loop196:
             do {
                 var alt196=2;
@@ -26472,8 +26516,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt196) {
                 case 1 :
-                    // xquery/XQueryParser.g:1737:21: ko= FTOR p_FTAnd
-                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14045); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1739:21: ko= FTOR p_FTAnd
+                    ko=this.match(this.input,FTOR,XQueryParser.FOLLOW_FTOR_in_p_FTOr14093); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ko_tree = this.adaptor.create(ko);
                     this.adaptor.addChild(root_0, ko_tree);
@@ -26481,12 +26525,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ko);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14049);
-                    p_FTAnd592=this.p_FTAnd();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnd_in_p_FTOr14097);
+                    p_FTAnd579=this.p_FTAnd();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd592.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnd579.getTree());
 
 
                     break;
@@ -26532,7 +26576,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1741:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
+    // xquery/XQueryParser.g:1743:1: p_FTAnd : p_FTMildNot (ka= FTAND p_FTMildNot )* ;
     // $ANTLR start "p_FTAnd"
     p_FTAnd: function() {
         var retval = new XQueryParser.p_FTAnd_return();
@@ -26541,23 +26585,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-         var p_FTMildNot593 = null;
-         var p_FTMildNot594 = null;
+         var p_FTMildNot580 = null;
+         var p_FTMildNot581 = null;
 
         var ka_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1742:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
-            // xquery/XQueryParser.g:1742:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
+            // xquery/XQueryParser.g:1744:9: ( p_FTMildNot (ka= FTAND p_FTMildNot )* )
+            // xquery/XQueryParser.g:1744:11: p_FTMildNot (ka= FTAND p_FTMildNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14078);
-            p_FTMildNot593=this.p_FTMildNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14126);
+            p_FTMildNot580=this.p_FTMildNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot593.getTree());
-            // xquery/XQueryParser.g:1742:23: (ka= FTAND p_FTMildNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot580.getTree());
+            // xquery/XQueryParser.g:1744:23: (ka= FTAND p_FTMildNot )*
             loop197:
             do {
                 var alt197=2;
@@ -26570,8 +26614,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt197) {
                 case 1 :
-                    // xquery/XQueryParser.g:1742:25: ka= FTAND p_FTMildNot
-                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14084); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1744:25: ka= FTAND p_FTMildNot
+                    ka=this.match(this.input,FTAND,XQueryParser.FOLLOW_FTAND_in_p_FTAnd14132); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -26579,12 +26623,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14088);
-                    p_FTMildNot594=this.p_FTMildNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMildNot_in_p_FTAnd14136);
+                    p_FTMildNot581=this.p_FTMildNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot594.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMildNot581.getTree());
 
 
                     break;
@@ -26630,7 +26674,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1746:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
+    // xquery/XQueryParser.g:1748:1: p_FTMildNot : p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* ;
     // $ANTLR start "p_FTMildNot"
     p_FTMildNot: function() {
         var retval = new XQueryParser.p_FTMildNot_return();
@@ -26640,23 +26684,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTUnaryNot595 = null;
-         var p_FTUnaryNot596 = null;
+         var p_FTUnaryNot582 = null;
+         var p_FTUnaryNot583 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1747:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
-            // xquery/XQueryParser.g:1747:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
+            // xquery/XQueryParser.g:1749:9: ( p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )* )
+            // xquery/XQueryParser.g:1749:11: p_FTUnaryNot (k+= NOT k+= IN p_FTUnaryNot )*
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117);
-            p_FTUnaryNot595=this.p_FTUnaryNot();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165);
+            p_FTUnaryNot582=this.p_FTUnaryNot();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot595.getTree());
-            // xquery/XQueryParser.g:1747:24: (k+= NOT k+= IN p_FTUnaryNot )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot582.getTree());
+            // xquery/XQueryParser.g:1749:24: (k+= NOT k+= IN p_FTUnaryNot )*
             loop198:
             do {
                 var alt198=2;
@@ -26669,8 +26713,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt198) {
                 case 1 :
-                    // xquery/XQueryParser.g:1747:26: k+= NOT k+= IN p_FTUnaryNot
-                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14123); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1749:26: k+= NOT k+= IN p_FTUnaryNot
+                    k=this.match(this.input,NOT,XQueryParser.FOLLOW_NOT_in_p_FTMildNot14171); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -26678,7 +26722,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14127); if (this.state.failed) return retval;
+                    k=this.match(this.input,IN,XQueryParser.FOLLOW_IN_in_p_FTMildNot14175); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -26689,12 +26733,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(list_k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131);
-                    p_FTUnaryNot596=this.p_FTUnaryNot();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179);
+                    p_FTUnaryNot583=this.p_FTUnaryNot();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot596.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnaryNot583.getTree());
 
 
                     break;
@@ -26740,7 +26784,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1751:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
+    // xquery/XQueryParser.g:1753:1: p_FTUnaryNot : (kn= FTNOT )? p_FTPrimaryWithOptions ;
     // $ANTLR start "p_FTUnaryNot"
     p_FTUnaryNot: function() {
         var retval = new XQueryParser.p_FTUnaryNot_return();
@@ -26749,16 +26793,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kn = null;
-         var p_FTPrimaryWithOptions597 = null;
+         var p_FTPrimaryWithOptions584 = null;
 
         var kn_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1752:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )? p_FTPrimaryWithOptions
+            // xquery/XQueryParser.g:1754:9: ( (kn= FTNOT )? p_FTPrimaryWithOptions )
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )? p_FTPrimaryWithOptions
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1752:11: (kn= FTNOT )?
+            // xquery/XQueryParser.g:1754:11: (kn= FTNOT )?
             var alt199=2;
             var LA199_0 = this.input.LA(1);
 
@@ -26767,8 +26811,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt199) {
                 case 1 :
-                    // xquery/XQueryParser.g:1752:13: kn= FTNOT
-                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14164); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1754:13: kn= FTNOT
+                    kn=this.match(this.input,FTNOT,XQueryParser.FOLLOW_FTNOT_in_p_FTUnaryNot14212); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     kn_tree = this.adaptor.create(kn);
                     this.adaptor.addChild(root_0, kn_tree);
@@ -26782,12 +26826,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171);
-            p_FTPrimaryWithOptions597=this.p_FTPrimaryWithOptions();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219);
+            p_FTPrimaryWithOptions584=this.p_FTPrimaryWithOptions();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions597.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimaryWithOptions584.getTree());
 
 
 
@@ -26824,7 +26868,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1756:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
+    // xquery/XQueryParser.g:1758:1: p_FTPrimaryWithOptions : p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? ;
     // $ANTLR start "p_FTPrimaryWithOptions"
     p_FTPrimaryWithOptions: function() {
         var retval = new XQueryParser.p_FTPrimaryWithOptions_return();
@@ -26832,23 +26876,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTPrimary598 = null;
-         var p_FTMatchOptions599 = null;
-         var p_FTWeight600 = null;
+         var p_FTPrimary585 = null;
+         var p_FTMatchOptions586 = null;
+         var p_FTWeight587 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1757:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
-            // xquery/XQueryParser.g:1757:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:9: ( p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )? )
+            // xquery/XQueryParser.g:1759:11: p_FTPrimary ( p_FTMatchOptions )? ( p_FTWeight )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197);
-            p_FTPrimary598=this.p_FTPrimary();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245);
+            p_FTPrimary585=this.p_FTPrimary();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary598.getTree());
-            // xquery/XQueryParser.g:1757:23: ( p_FTMatchOptions )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTPrimary585.getTree());
+            // xquery/XQueryParser.g:1759:23: ( p_FTMatchOptions )?
             var alt200=2;
             var LA200_0 = this.input.LA(1);
 
@@ -26857,20 +26901,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt200) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:23: p_FTMatchOptions
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199);
-                    p_FTMatchOptions599=this.p_FTMatchOptions();
+                    // xquery/XQueryParser.g:1759:23: p_FTMatchOptions
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247);
+                    p_FTMatchOptions586=this.p_FTMatchOptions();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions599.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOptions586.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1757:41: ( p_FTWeight )?
+            // xquery/XQueryParser.g:1759:41: ( p_FTWeight )?
             var alt201=2;
             var LA201_0 = this.input.LA(1);
 
@@ -26879,13 +26923,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt201) {
                 case 1 :
-                    // xquery/XQueryParser.g:1757:41: p_FTWeight
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202);
-                    p_FTWeight600=this.p_FTWeight();
+                    // xquery/XQueryParser.g:1759:41: p_FTWeight
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250);
+                    p_FTWeight587=this.p_FTWeight();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight600.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWeight587.getTree());
 
 
                     break;
@@ -26928,7 +26972,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1764:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
+    // xquery/XQueryParser.g:1766:1: p_FTPrimary : ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection );
     // $ANTLR start "p_FTPrimary"
     p_FTPrimary: function() {
         var retval = new XQueryParser.p_FTPrimary_return();
@@ -26936,18 +26980,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN603 = null;
-        var RPAREN605 = null;
-         var p_FTWords601 = null;
-         var p_FTTimes602 = null;
-         var p_FTSelection604 = null;
-         var p_FTExtensionSelection606 = null;
+        var LPAREN590 = null;
+        var RPAREN592 = null;
+         var p_FTWords588 = null;
+         var p_FTTimes589 = null;
+         var p_FTSelection591 = null;
+         var p_FTExtensionSelection593 = null;
 
-        var LPAREN603_tree=null;
-        var RPAREN605_tree=null;
+        var LPAREN590_tree=null;
+        var RPAREN592_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1765:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
+            // xquery/XQueryParser.g:1767:9: ( ( p_FTWords ( p_FTTimes )? ) | ( LPAREN p_FTSelection RPAREN ) | p_FTExtensionSelection )
             var alt203=3;
             switch ( this.input.LA(1) ) {
             case LBRACKET:
@@ -26971,18 +27015,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt203) {
                 case 1 :
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1765:11: ( p_FTWords ( p_FTTimes )? )
-                    // xquery/XQueryParser.g:1765:12: p_FTWords ( p_FTTimes )?
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14233);
-                    p_FTWords601=this.p_FTWords();
+                    // xquery/XQueryParser.g:1767:11: ( p_FTWords ( p_FTTimes )? )
+                    // xquery/XQueryParser.g:1767:12: p_FTWords ( p_FTTimes )?
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWords_in_p_FTPrimary14281);
+                    p_FTWords588=this.p_FTWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords601.getTree());
-                    // xquery/XQueryParser.g:1765:22: ( p_FTTimes )?
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWords588.getTree());
+                    // xquery/XQueryParser.g:1767:22: ( p_FTTimes )?
                     var alt202=2;
                     var LA202_0 = this.input.LA(1);
 
@@ -26991,13 +27035,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt202) {
                         case 1 :
-                            // xquery/XQueryParser.g:1765:22: p_FTTimes
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14235);
-                            p_FTTimes602=this.p_FTTimes();
+                            // xquery/XQueryParser.g:1767:22: p_FTTimes
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTTimes_in_p_FTPrimary14283);
+                            p_FTTimes589=this.p_FTTimes();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes602.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTTimes589.getTree());
 
 
                             break;
@@ -27011,26 +27055,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1766:11: ( LPAREN p_FTSelection RPAREN )
-                    // xquery/XQueryParser.g:1766:12: LPAREN p_FTSelection RPAREN
-                    LPAREN603=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14250); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1768:11: ( LPAREN p_FTSelection RPAREN )
+                    // xquery/XQueryParser.g:1768:12: LPAREN p_FTSelection RPAREN
+                    LPAREN590=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTPrimary14298); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN603_tree = this.adaptor.create(LPAREN603);
-                    this.adaptor.addChild(root_0, LPAREN603_tree);
+                    LPAREN590_tree = this.adaptor.create(LPAREN590);
+                    this.adaptor.addChild(root_0, LPAREN590_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14252);
-                    p_FTSelection604=this.p_FTSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTPrimary14300);
+                    p_FTSelection591=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection604.getTree());
-                    RPAREN605=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14254); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection591.getTree());
+                    RPAREN592=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTPrimary14302); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN605_tree = this.adaptor.create(RPAREN605);
-                    this.adaptor.addChild(root_0, RPAREN605_tree);
+                    RPAREN592_tree = this.adaptor.create(RPAREN592);
+                    this.adaptor.addChild(root_0, RPAREN592_tree);
                     }
 
 
@@ -27039,15 +27083,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1767:11: p_FTExtensionSelection
+                    // xquery/XQueryParser.g:1769:11: p_FTExtensionSelection
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267);
-                    p_FTExtensionSelection606=this.p_FTExtensionSelection();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315);
+                    p_FTExtensionSelection593=this.p_FTExtensionSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection606.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionSelection593.getTree());
 
 
                     break;
@@ -27086,7 +27130,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1771:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
+    // xquery/XQueryParser.g:1773:1: p_FTWords : p_FTWordsValue ( p_FTAnyallOption )? ;
     // $ANTLR start "p_FTWords"
     p_FTWords: function() {
         var retval = new XQueryParser.p_FTWords_return();
@@ -27094,22 +27138,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTWordsValue607 = null;
-         var p_FTAnyallOption608 = null;
+         var p_FTWordsValue594 = null;
+         var p_FTAnyallOption595 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1772:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
-            // xquery/XQueryParser.g:1772:11: p_FTWordsValue ( p_FTAnyallOption )?
+            // xquery/XQueryParser.g:1774:9: ( p_FTWordsValue ( p_FTAnyallOption )? )
+            // xquery/XQueryParser.g:1774:11: p_FTWordsValue ( p_FTAnyallOption )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14293);
-            p_FTWordsValue607=this.p_FTWordsValue();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTWordsValue_in_p_FTWords14341);
+            p_FTWordsValue594=this.p_FTWordsValue();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue607.getTree());
-            // xquery/XQueryParser.g:1772:26: ( p_FTAnyallOption )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWordsValue594.getTree());
+            // xquery/XQueryParser.g:1774:26: ( p_FTAnyallOption )?
             var alt204=2;
             var LA204_0 = this.input.LA(1);
 
@@ -27118,13 +27162,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt204) {
                 case 1 :
-                    // xquery/XQueryParser.g:1772:26: p_FTAnyallOption
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14295);
-                    p_FTAnyallOption608=this.p_FTAnyallOption();
+                    // xquery/XQueryParser.g:1774:26: p_FTAnyallOption
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTAnyallOption_in_p_FTWords14343);
+                    p_FTAnyallOption595=this.p_FTAnyallOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption608.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTAnyallOption595.getTree());
 
 
                     break;
@@ -27167,7 +27211,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1776:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
+    // xquery/XQueryParser.g:1778:1: p_FTWordsValue : ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) );
     // $ANTLR start "p_FTWordsValue"
     p_FTWordsValue: function() {
         var retval = new XQueryParser.p_FTWordsValue_return();
@@ -27175,16 +27219,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET610 = null;
-        var RBRACKET612 = null;
-         var p_StringLiteral609 = null;
-         var p_Expr611 = null;
+        var LBRACKET597 = null;
+        var RBRACKET599 = null;
+         var p_StringLiteral596 = null;
+         var p_Expr598 = null;
 
-        var LBRACKET610_tree=null;
-        var RBRACKET612_tree=null;
+        var LBRACKET597_tree=null;
+        var RBRACKET599_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1777:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
+            // xquery/XQueryParser.g:1779:9: ( p_StringLiteral | ( LBRACKET p_Expr[true,true] RBRACKET ) )
             var alt205=2;
             var LA205_0 = this.input.LA(1);
 
@@ -27203,39 +27247,39 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt205) {
                 case 1 :
-                    // xquery/XQueryParser.g:1777:11: p_StringLiteral
+                    // xquery/XQueryParser.g:1779:11: p_StringLiteral
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14322);
-                    p_StringLiteral609=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTWordsValue14370);
+                    p_StringLiteral596=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral609.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral596.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1778:11: ( LBRACKET p_Expr[true,true] RBRACKET )
-                    // xquery/XQueryParser.g:1778:12: LBRACKET p_Expr[true,true] RBRACKET
-                    LBRACKET610=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14335); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1780:11: ( LBRACKET p_Expr[true,true] RBRACKET )
+                    // xquery/XQueryParser.g:1780:12: LBRACKET p_Expr[true,true] RBRACKET
+                    LBRACKET597=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTWordsValue14383); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LBRACKET610_tree = this.adaptor.create(LBRACKET610);
-                    this.adaptor.addChild(root_0, LBRACKET610_tree);
+                    LBRACKET597_tree = this.adaptor.create(LBRACKET597);
+                    this.adaptor.addChild(root_0, LBRACKET597_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14337);
-                    p_Expr611=this.p_Expr(true, true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_FTWordsValue14385);
+                    p_Expr598=this.p_Expr(true, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr611.getTree());
-                    RBRACKET612=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14340); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr598.getTree());
+                    RBRACKET599=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTWordsValue14388); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RBRACKET612_tree = this.adaptor.create(RBRACKET612);
-                    this.adaptor.addChild(root_0, RBRACKET612_tree);
+                    RBRACKET599_tree = this.adaptor.create(RBRACKET599);
+                    this.adaptor.addChild(root_0, RBRACKET599_tree);
                     }
 
 
@@ -27278,7 +27322,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1782:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
+    // xquery/XQueryParser.g:1784:1: p_FTExtensionSelection : ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET ;
     // $ANTLR start "p_FTExtensionSelection"
     p_FTExtensionSelection: function() {
         var retval = new XQueryParser.p_FTExtensionSelection_return();
@@ -27286,21 +27330,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_Pragma613 = null;
-        var LBRACKET614 = null;
-        var RBRACKET616 = null;
-         var p_FTSelection615 = null;
+        var L_Pragma600 = null;
+        var LBRACKET601 = null;
+        var RBRACKET603 = null;
+         var p_FTSelection602 = null;
 
-        var L_Pragma613_tree=null;
-        var LBRACKET614_tree=null;
-        var RBRACKET616_tree=null;
+        var L_Pragma600_tree=null;
+        var LBRACKET601_tree=null;
+        var RBRACKET603_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1783:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
+            // xquery/XQueryParser.g:1785:9: ( ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET )
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+ LBRACKET ( p_FTSelection )? RBRACKET
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1783:11: ( L_Pragma )+
+            // xquery/XQueryParser.g:1785:11: ( L_Pragma )+
             var cnt206=0;
             loop206:
             do {
@@ -27314,11 +27358,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt206) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:11: L_Pragma
-                    L_Pragma613=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14367); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1785:11: L_Pragma
+                    L_Pragma600=this.match(this.input,L_Pragma,XQueryParser.FOLLOW_L_Pragma_in_p_FTExtensionSelection14415); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_Pragma613_tree = this.adaptor.create(L_Pragma613);
-                    this.adaptor.addChild(root_0, L_Pragma613_tree);
+                    L_Pragma600_tree = this.adaptor.create(L_Pragma600);
+                    this.adaptor.addChild(root_0, L_Pragma600_tree);
                     }
 
 
@@ -27335,12 +27379,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt206++;
             } while (true);
 
-            LBRACKET614=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14370); if (this.state.failed) return retval;
+            LBRACKET601=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_FTExtensionSelection14418); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET614_tree = this.adaptor.create(LBRACKET614);
-            this.adaptor.addChild(root_0, LBRACKET614_tree);
+            LBRACKET601_tree = this.adaptor.create(LBRACKET601);
+            this.adaptor.addChild(root_0, LBRACKET601_tree);
             }
-            // xquery/XQueryParser.g:1783:30: ( p_FTSelection )?
+            // xquery/XQueryParser.g:1785:30: ( p_FTSelection )?
             var alt207=2;
             var LA207_0 = this.input.LA(1);
 
@@ -27349,23 +27393,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt207) {
                 case 1 :
-                    // xquery/XQueryParser.g:1783:30: p_FTSelection
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372);
-                    p_FTSelection615=this.p_FTSelection();
+                    // xquery/XQueryParser.g:1785:30: p_FTSelection
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420);
+                    p_FTSelection602=this.p_FTSelection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection615.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTSelection602.getTree());
 
 
                     break;
 
             }
 
-            RBRACKET616=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14375); if (this.state.failed) return retval;
+            RBRACKET603=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_FTExtensionSelection14423); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET616_tree = this.adaptor.create(RBRACKET616);
-            this.adaptor.addChild(root_0, RBRACKET616_tree);
+            RBRACKET603_tree = this.adaptor.create(RBRACKET603);
+            this.adaptor.addChild(root_0, RBRACKET603_tree);
             }
 
 
@@ -27403,7 +27447,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1787:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
+    // xquery/XQueryParser.g:1789:1: p_FTAnyallOption : ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) ;
     // $ANTLR start "p_FTAnyallOption"
     p_FTAnyallOption: function() {
         var retval = new XQueryParser.p_FTAnyallOption_return();
@@ -27411,19 +27455,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var WORDS617 = null;
+        var WORDS604 = null;
         var k = null;
         var list_k=null;
 
-        var WORDS617_tree=null;
+        var WORDS604_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1788:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:9: ( ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE ) )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1788:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
+            // xquery/XQueryParser.g:1790:11: ( (k+= ANY (k+= WORD )? ) | (k+= ALL ( WORDS )? ) | k+= PHRASE )
             var alt210=3;
             switch ( this.input.LA(1) ) {
             case ANY:
@@ -27445,10 +27489,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt210) {
                 case 1 :
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:13: (k+= ANY (k+= WORD )? )
-                    // xquery/XQueryParser.g:1788:14: k+= ANY (k+= WORD )?
-                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14406); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:13: (k+= ANY (k+= WORD )? )
+                    // xquery/XQueryParser.g:1790:14: k+= ANY (k+= WORD )?
+                    k=this.match(this.input,ANY,XQueryParser.FOLLOW_ANY_in_p_FTAnyallOption14454); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27456,7 +27500,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:22: (k+= WORD )?
+                    // xquery/XQueryParser.g:1790:22: (k+= WORD )?
                     var alt208=2;
                     var LA208_0 = this.input.LA(1);
 
@@ -27465,8 +27509,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt208) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:22: k+= WORD
-                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14410); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:22: k+= WORD
+                            k=this.match(this.input,WORD,XQueryParser.FOLLOW_WORD_in_p_FTAnyallOption14458); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -27487,10 +27531,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:33: (k+= ALL ( WORDS )? )
-                    // xquery/XQueryParser.g:1788:34: k+= ALL ( WORDS )?
-                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14419); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:33: (k+= ALL ( WORDS )? )
+                    // xquery/XQueryParser.g:1790:34: k+= ALL ( WORDS )?
+                    k=this.match(this.input,ALL,XQueryParser.FOLLOW_ALL_in_p_FTAnyallOption14467); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27498,7 +27542,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1788:41: ( WORDS )?
+                    // xquery/XQueryParser.g:1790:41: ( WORDS )?
                     var alt209=2;
                     var LA209_0 = this.input.LA(1);
 
@@ -27507,11 +27551,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt209) {
                         case 1 :
-                            // xquery/XQueryParser.g:1788:41: WORDS
-                            WORDS617=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14421); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1790:41: WORDS
+                            WORDS604=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTAnyallOption14469); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            WORDS617_tree = this.adaptor.create(WORDS617);
-                            this.adaptor.addChild(root_0, WORDS617_tree);
+                            WORDS604_tree = this.adaptor.create(WORDS604);
+                            this.adaptor.addChild(root_0, WORDS604_tree);
                             }
 
 
@@ -27526,8 +27570,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1788:51: k+= PHRASE
-                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14429); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1790:51: k+= PHRASE
+                    k=this.match(this.input,PHRASE,XQueryParser.FOLLOW_PHRASE_in_p_FTAnyallOption14477); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27580,7 +27624,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1792:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
+    // xquery/XQueryParser.g:1794:1: p_FTTimes : k+= OCCURS p_FTRange k+= TIMES ;
     // $ANTLR start "p_FTTimes"
     p_FTTimes: function() {
         var retval = new XQueryParser.p_FTTimes_return();
@@ -27590,16 +27634,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTRange618 = null;
+         var p_FTRange605 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1793:9: (k+= OCCURS p_FTRange k+= TIMES )
-            // xquery/XQueryParser.g:1793:11: k+= OCCURS p_FTRange k+= TIMES
+            // xquery/XQueryParser.g:1795:9: (k+= OCCURS p_FTRange k+= TIMES )
+            // xquery/XQueryParser.g:1795:11: k+= OCCURS p_FTRange k+= TIMES
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14461); if (this.state.failed) return retval;
+            k=this.match(this.input,OCCURS,XQueryParser.FOLLOW_OCCURS_in_p_FTTimes14509); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27607,13 +27651,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14463);
-            p_FTRange618=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTTimes14511);
+            p_FTRange605=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
-            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14467); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange605.getTree());
+            k=this.match(this.input,TIMES,XQueryParser.FOLLOW_TIMES_in_p_FTTimes14515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -27660,7 +27704,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1797:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
+    // xquery/XQueryParser.g:1799:1: p_FTRange : ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) ;
     // $ANTLR start "p_FTRange"
     p_FTRange: function() {
         var retval = new XQueryParser.p_FTRange_return();
@@ -27670,20 +27714,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_AdditiveExpr619 = null;
-         var p_AdditiveExpr620 = null;
-         var p_AdditiveExpr621 = null;
-         var p_AdditiveExpr622 = null;
-         var p_AdditiveExpr623 = null;
+         var p_AdditiveExpr606 = null;
+         var p_AdditiveExpr607 = null;
+         var p_AdditiveExpr608 = null;
+         var p_AdditiveExpr609 = null;
+         var p_AdditiveExpr610 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1798:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:9: ( ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1798:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
+            // xquery/XQueryParser.g:1800:11: ( (k+= EXACTLY p_AdditiveExpr ) | (k+= AT k+= LEAST p_AdditiveExpr ) | (k+= AT k+= MOST p_AdditiveExpr ) | (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr ) )
             var alt211=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -27719,74 +27763,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt211) {
                 case 1 :
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:13: (k+= EXACTLY p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1798:14: k+= EXACTLY p_AdditiveExpr
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14500); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14502);
-                    p_AdditiveExpr619=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr619.getTree());
-
-
-
-
-
-                    break;
-                case 2 :
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:13: (k+= AT k+= LEAST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1799:14: k+= AT k+= LEAST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14520); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14524); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14526);
-                    p_AdditiveExpr620=this.p_AdditiveExpr();
-
-                    this.state._fsp--;
-                    if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr620.getTree());
-
-
-
-
-
-                    break;
-                case 3 :
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:13: (k+= AT k+= MOST p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1800:14: k+= AT k+= MOST p_AdditiveExpr
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14544); if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) {
-                    k_tree = this.adaptor.create(k);
-                    this.adaptor.addChild(root_0, k_tree);
-                    }
-                    if (org.antlr.lang.isNull(list_k)) list_k = [];
-                    list_k.push(k);
-
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14548); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:13: (k+= EXACTLY p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1800:14: k+= EXACTLY p_AdditiveExpr
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTRange14548); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27795,11 +27775,75 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     list_k.push(k);
 
                     this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14550);
-                    p_AdditiveExpr621=this.p_AdditiveExpr();
+                    p_AdditiveExpr606=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr621.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr606.getTree());
+
+
+
+
+
+                    break;
+                case 2 :
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:13: (k+= AT k+= LEAST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1801:14: k+= AT k+= LEAST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14568); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTRange14572); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14574);
+                    p_AdditiveExpr607=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr607.getTree());
+
+
+
+
+
+                    break;
+                case 3 :
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:13: (k+= AT k+= MOST p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1802:14: k+= AT k+= MOST p_AdditiveExpr
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTRange14592); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTRange14596); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) {
+                    k_tree = this.adaptor.create(k);
+                    this.adaptor.addChild(root_0, k_tree);
+                    }
+                    if (org.antlr.lang.isNull(list_k)) list_k = [];
+                    list_k.push(k);
+
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14598);
+                    p_AdditiveExpr608=this.p_AdditiveExpr();
+
+                    this.state._fsp--;
+                    if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr608.getTree());
 
 
 
@@ -27807,10 +27851,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
-                    // xquery/XQueryParser.g:1801:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14568); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:13: (k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr )
+                    // xquery/XQueryParser.g:1803:14: k+= FROM p_AdditiveExpr k+= TO p_AdditiveExpr
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTRange14616); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27818,13 +27862,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14570);
-                    p_AdditiveExpr622=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14618);
+                    p_AdditiveExpr609=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr622.getTree());
-                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14574); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr609.getTree());
+                    k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTRange14622); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -27832,12 +27876,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14576);
-                    p_AdditiveExpr623=this.p_AdditiveExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTRange14624);
+                    p_AdditiveExpr610=this.p_AdditiveExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr623.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr610.getTree());
 
 
 
@@ -27886,7 +27930,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1805:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
+    // xquery/XQueryParser.g:1807:1: p_FTPosFilter : ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent );
     // $ANTLR start "p_FTPosFilter"
     p_FTPosFilter: function() {
         var retval = new XQueryParser.p_FTPosFilter_return();
@@ -27894,15 +27938,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTOrder624 = null;
-         var p_FTWindow625 = null;
-         var p_FTDistance626 = null;
-         var p_FTScope627 = null;
-         var p_FTContent628 = null;
+         var p_FTOrder611 = null;
+         var p_FTWindow612 = null;
+         var p_FTDistance613 = null;
+         var p_FTScope614 = null;
+         var p_FTContent615 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1806:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
+            // xquery/XQueryParser.g:1808:9: ( p_FTOrder | p_FTWindow | p_FTDistance | p_FTScope | p_FTContent )
             var alt212=5;
             switch ( this.input.LA(1) ) {
             case ORDERED:
@@ -27932,67 +27976,67 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt212) {
                 case 1 :
-                    // xquery/XQueryParser.g:1806:11: p_FTOrder
+                    // xquery/XQueryParser.g:1808:11: p_FTOrder
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14607);
-                    p_FTOrder624=this.p_FTOrder();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTOrder_in_p_FTPosFilter14655);
+                    p_FTOrder611=this.p_FTOrder();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder624.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTOrder611.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1806:23: p_FTWindow
+                    // xquery/XQueryParser.g:1808:23: p_FTWindow
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14611);
-                    p_FTWindow625=this.p_FTWindow();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWindow_in_p_FTPosFilter14659);
+                    p_FTWindow612=this.p_FTWindow();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow625.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWindow612.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1806:36: p_FTDistance
+                    // xquery/XQueryParser.g:1808:36: p_FTDistance
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14615);
-                    p_FTDistance626=this.p_FTDistance();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDistance_in_p_FTPosFilter14663);
+                    p_FTDistance613=this.p_FTDistance();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance626.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDistance613.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1806:51: p_FTScope
+                    // xquery/XQueryParser.g:1808:51: p_FTScope
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14619);
-                    p_FTScope627=this.p_FTScope();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTScope_in_p_FTPosFilter14667);
+                    p_FTScope614=this.p_FTScope();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope627.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTScope614.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1806:63: p_FTContent
+                    // xquery/XQueryParser.g:1808:63: p_FTContent
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14623);
-                    p_FTContent628=this.p_FTContent();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTContent_in_p_FTPosFilter14671);
+                    p_FTContent615=this.p_FTContent();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent628.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTContent615.getTree());
 
 
                     break;
@@ -28031,7 +28075,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1810:1: p_FTOrder : ko= ORDERED ;
+    // xquery/XQueryParser.g:1812:1: p_FTOrder : ko= ORDERED ;
     // $ANTLR start "p_FTOrder"
     p_FTOrder: function() {
         var retval = new XQueryParser.p_FTOrder_return();
@@ -28044,11 +28088,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1811:9: (ko= ORDERED )
-            // xquery/XQueryParser.g:1811:11: ko= ORDERED
+            // xquery/XQueryParser.g:1813:9: (ko= ORDERED )
+            // xquery/XQueryParser.g:1813:11: ko= ORDERED
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14651); if (this.state.failed) return retval;
+            ko=this.match(this.input,ORDERED,XQueryParser.FOLLOW_ORDERED_in_p_FTOrder14699); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -28092,7 +28136,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1815:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
+    // xquery/XQueryParser.g:1817:1: p_FTWindow : kw= WINDOW p_AdditiveExpr p_FTUnit ;
     // $ANTLR start "p_FTWindow"
     p_FTWindow: function() {
         var retval = new XQueryParser.p_FTWindow_return();
@@ -28101,17 +28145,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kw = null;
-         var p_AdditiveExpr629 = null;
-         var p_FTUnit630 = null;
+         var p_AdditiveExpr616 = null;
+         var p_FTUnit617 = null;
 
         var kw_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1816:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
-            // xquery/XQueryParser.g:1816:11: kw= WINDOW p_AdditiveExpr p_FTUnit
+            // xquery/XQueryParser.g:1818:9: (kw= WINDOW p_AdditiveExpr p_FTUnit )
+            // xquery/XQueryParser.g:1818:11: kw= WINDOW p_AdditiveExpr p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14681); if (this.state.failed) return retval;
+            kw=this.match(this.input,WINDOW,XQueryParser.FOLLOW_WINDOW_in_p_FTWindow14729); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kw_tree = this.adaptor.create(kw);
             this.adaptor.addChild(root_0, kw_tree);
@@ -28119,18 +28163,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kw);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14685);
-            p_AdditiveExpr629=this.p_AdditiveExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_AdditiveExpr_in_p_FTWindow14733);
+            p_AdditiveExpr616=this.p_AdditiveExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr629.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14687);
-            p_FTUnit630=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AdditiveExpr616.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTWindow14735);
+            p_FTUnit617=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit630.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit617.getTree());
 
 
 
@@ -28167,7 +28211,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1820:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
+    // xquery/XQueryParser.g:1822:1: p_FTDistance : kd= DISTANCE p_FTRange p_FTUnit ;
     // $ANTLR start "p_FTDistance"
     p_FTDistance: function() {
         var retval = new XQueryParser.p_FTDistance_return();
@@ -28176,17 +28220,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kd = null;
-         var p_FTRange631 = null;
-         var p_FTUnit632 = null;
+         var p_FTRange618 = null;
+         var p_FTUnit619 = null;
 
         var kd_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1821:9: (kd= DISTANCE p_FTRange p_FTUnit )
-            // xquery/XQueryParser.g:1821:11: kd= DISTANCE p_FTRange p_FTUnit
+            // xquery/XQueryParser.g:1823:9: (kd= DISTANCE p_FTRange p_FTUnit )
+            // xquery/XQueryParser.g:1823:11: kd= DISTANCE p_FTRange p_FTUnit
             root_0 = this.adaptor.nil();
 
-            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14715); if (this.state.failed) return retval;
+            kd=this.match(this.input,DISTANCE,XQueryParser.FOLLOW_DISTANCE_in_p_FTDistance14763); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kd_tree = this.adaptor.create(kd);
             this.adaptor.addChild(root_0, kd_tree);
@@ -28194,18 +28238,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kd);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14719);
-            p_FTRange631=this.p_FTRange();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTRange_in_p_FTDistance14767);
+            p_FTRange618=this.p_FTRange();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange631.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14721);
-            p_FTUnit632=this.p_FTUnit();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTRange618.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_FTUnit_in_p_FTDistance14769);
+            p_FTUnit619=this.p_FTUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit632.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTUnit619.getTree());
 
 
 
@@ -28242,7 +28286,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1825:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
+    // xquery/XQueryParser.g:1827:1: p_FTUnit : (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) ;
     // $ANTLR start "p_FTUnit"
     p_FTUnit: function() {
         var retval = new XQueryParser.p_FTUnit_return();
@@ -28256,11 +28300,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1826:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:9: ( (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS ) )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1826:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
+            // xquery/XQueryParser.g:1828:11: (k+= WORDS | k+= SENTENCES | k+= PARAGRAPHS )
             var alt213=3;
             switch ( this.input.LA(1) ) {
             case WORDS:
@@ -28282,8 +28326,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt213) {
                 case 1 :
-                    // xquery/XQueryParser.g:1826:13: k+= WORDS
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14751); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:13: k+= WORDS
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTUnit14799); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28295,8 +28339,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1826:24: k+= SENTENCES
-                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14757); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:24: k+= SENTENCES
+                    k=this.match(this.input,SENTENCES,XQueryParser.FOLLOW_SENTENCES_in_p_FTUnit14805); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28308,8 +28352,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1826:39: k+= PARAGRAPHS
-                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14763); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1828:39: k+= PARAGRAPHS
+                    k=this.match(this.input,PARAGRAPHS,XQueryParser.FOLLOW_PARAGRAPHS_in_p_FTUnit14811); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28362,7 +28406,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1830:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
+    // xquery/XQueryParser.g:1832:1: p_FTScope : (k+= SAME | k+= DIFFERENT ) p_FTBigUnit ;
     // $ANTLR start "p_FTScope"
     p_FTScope: function() {
         var retval = new XQueryParser.p_FTScope_return();
@@ -28372,16 +28416,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTBigUnit633 = null;
+         var p_FTBigUnit620 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1831:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
+            // xquery/XQueryParser.g:1833:9: ( (k+= SAME | k+= DIFFERENT ) p_FTBigUnit )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT ) p_FTBigUnit
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1831:11: (k+= SAME | k+= DIFFERENT )
+            // xquery/XQueryParser.g:1833:11: (k+= SAME | k+= DIFFERENT )
             var alt214=2;
             var LA214_0 = this.input.LA(1);
 
@@ -28400,8 +28444,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt214) {
                 case 1 :
-                    // xquery/XQueryParser.g:1831:12: k+= SAME
-                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14796); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:12: k+= SAME
+                    k=this.match(this.input,SAME,XQueryParser.FOLLOW_SAME_in_p_FTScope14844); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28413,8 +28457,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1831:22: k+= DIFFERENT
-                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14802); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1833:22: k+= DIFFERENT
+                    k=this.match(this.input,DIFFERENT,XQueryParser.FOLLOW_DIFFERENT_in_p_FTScope14850); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28431,12 +28475,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14807);
-            p_FTBigUnit633=this.p_FTBigUnit();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTBigUnit_in_p_FTScope14855);
+            p_FTBigUnit620=this.p_FTBigUnit();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit633.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTBigUnit620.getTree());
 
 
 
@@ -28473,7 +28517,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1835:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
+    // xquery/XQueryParser.g:1837:1: p_FTBigUnit : (k+= SENTENCE | k+= PARAGRAPH ) ;
     // $ANTLR start "p_FTBigUnit"
     p_FTBigUnit: function() {
         var retval = new XQueryParser.p_FTBigUnit_return();
@@ -28487,11 +28531,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1836:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:9: ( (k+= SENTENCE | k+= PARAGRAPH ) )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1836:11: (k+= SENTENCE | k+= PARAGRAPH )
+            // xquery/XQueryParser.g:1838:11: (k+= SENTENCE | k+= PARAGRAPH )
             var alt215=2;
             var LA215_0 = this.input.LA(1);
 
@@ -28510,8 +28554,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt215) {
                 case 1 :
-                    // xquery/XQueryParser.g:1836:13: k+= SENTENCE
-                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14837); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:13: k+= SENTENCE
+                    k=this.match(this.input,SENTENCE,XQueryParser.FOLLOW_SENTENCE_in_p_FTBigUnit14885); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28523,8 +28567,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1836:27: k+= PARAGRAPH
-                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14843); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1838:27: k+= PARAGRAPH
+                    k=this.match(this.input,PARAGRAPH,XQueryParser.FOLLOW_PARAGRAPH_in_p_FTBigUnit14891); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28577,7 +28621,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1840:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
+    // xquery/XQueryParser.g:1842:1: p_FTContent : ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) ;
     // $ANTLR start "p_FTContent"
     p_FTContent: function() {
         var retval = new XQueryParser.p_FTContent_return();
@@ -28591,11 +28635,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1841:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:9: ( ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1841:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
+            // xquery/XQueryParser.g:1843:11: ( (k+= AT k+= START ) | (k+= AT k+= END ) | (k+= ENTIRE k+= CONTENT ) )
             var alt216=3;
             var LA216_0 = this.input.LA(1);
 
@@ -28628,10 +28672,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt216) {
                 case 1 :
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:13: (k+= AT k+= START )
-                    // xquery/XQueryParser.g:1841:14: k+= AT k+= START
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14878); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:13: (k+= AT k+= START )
+                    // xquery/XQueryParser.g:1843:14: k+= AT k+= START
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14926); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28639,7 +28683,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14882); if (this.state.failed) return retval;
+                    k=this.match(this.input,START,XQueryParser.FOLLOW_START_in_p_FTContent14930); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28654,10 +28698,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:32: (k+= AT k+= END )
-                    // xquery/XQueryParser.g:1841:33: k+= AT k+= END
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14890); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:32: (k+= AT k+= END )
+                    // xquery/XQueryParser.g:1843:33: k+= AT k+= END
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTContent14938); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28665,7 +28709,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14894); if (this.state.failed) return retval;
+                    k=this.match(this.input,END,XQueryParser.FOLLOW_END_in_p_FTContent14942); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28680,10 +28724,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:49: (k+= ENTIRE k+= CONTENT )
-                    // xquery/XQueryParser.g:1841:50: k+= ENTIRE k+= CONTENT
-                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14902); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:49: (k+= ENTIRE k+= CONTENT )
+                    // xquery/XQueryParser.g:1843:50: k+= ENTIRE k+= CONTENT
+                    k=this.match(this.input,ENTIRE,XQueryParser.FOLLOW_ENTIRE_in_p_FTContent14950); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28691,7 +28735,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14906); if (this.state.failed) return retval;
+                    k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTContent14954); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -28747,7 +28791,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1845:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
+    // xquery/XQueryParser.g:1847:1: p_FTMatchOptions : (ku= USING p_FTMatchOption )+ ;
     // $ANTLR start "p_FTMatchOptions"
     p_FTMatchOptions: function() {
         var retval = new XQueryParser.p_FTMatchOptions_return();
@@ -28756,16 +28800,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ku = null;
-         var p_FTMatchOption634 = null;
+         var p_FTMatchOption621 = null;
 
         var ku_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1846:9: ( (ku= USING p_FTMatchOption )+ )
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:9: ( (ku= USING p_FTMatchOption )+ )
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1846:11: (ku= USING p_FTMatchOption )+
+            // xquery/XQueryParser.g:1848:11: (ku= USING p_FTMatchOption )+
             var cnt217=0;
             loop217:
             do {
@@ -28779,8 +28823,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt217) {
                 case 1 :
-                    // xquery/XQueryParser.g:1846:12: ku= USING p_FTMatchOption
-                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14940); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1848:12: ku= USING p_FTMatchOption
+                    ku=this.match(this.input,USING,XQueryParser.FOLLOW_USING_in_p_FTMatchOptions14988); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ku_tree = this.adaptor.create(ku);
                     this.adaptor.addChild(root_0, ku_tree);
@@ -28788,12 +28832,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ku);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944);
-                    p_FTMatchOption634=this.p_FTMatchOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992);
+                    p_FTMatchOption621=this.p_FTMatchOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption634.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTMatchOption621.getTree());
 
 
                     break;
@@ -28845,7 +28889,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
+    // xquery/XQueryParser.g:1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );
     // $ANTLR start "p_FTMatchOption"
     p_FTMatchOption: function() {
         var retval = new XQueryParser.p_FTMatchOption_return();
@@ -28853,122 +28897,122 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_FTLanguageOption635 = null;
-         var p_FTWildCardOption636 = null;
-         var p_FTThesaurusOption637 = null;
-         var p_FTStemOption638 = null;
-         var p_FTCaseOption639 = null;
-         var p_FTDiacriticsOption640 = null;
-         var p_FTStopWordOption641 = null;
-         var p_FTExtensionOption642 = null;
+         var p_FTLanguageOption622 = null;
+         var p_FTWildCardOption623 = null;
+         var p_FTThesaurusOption624 = null;
+         var p_FTStemOption625 = null;
+         var p_FTCaseOption626 = null;
+         var p_FTDiacriticsOption627 = null;
+         var p_FTStopWordOption628 = null;
+         var p_FTExtensionOption629 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1851:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
+            // xquery/XQueryParser.g:1853:9: ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption )
             var alt218=8;
             alt218 = this.dfa218.predict(this.input);
             switch (alt218) {
                 case 1 :
-                    // xquery/XQueryParser.g:1851:11: p_FTLanguageOption
+                    // xquery/XQueryParser.g:1853:11: p_FTLanguageOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972);
-                    p_FTLanguageOption635=this.p_FTLanguageOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020);
+                    p_FTLanguageOption622=this.p_FTLanguageOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption635.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLanguageOption622.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1852:11: p_FTWildCardOption
+                    // xquery/XQueryParser.g:1854:11: p_FTWildCardOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984);
-                    p_FTWildCardOption636=this.p_FTWildCardOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032);
+                    p_FTWildCardOption623=this.p_FTWildCardOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption636.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTWildCardOption623.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1853:11: p_FTThesaurusOption
+                    // xquery/XQueryParser.g:1855:11: p_FTThesaurusOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996);
-                    p_FTThesaurusOption637=this.p_FTThesaurusOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044);
+                    p_FTThesaurusOption624=this.p_FTThesaurusOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption637.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusOption624.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1854:11: p_FTStemOption
+                    // xquery/XQueryParser.g:1856:11: p_FTStemOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15008);
-                    p_FTStemOption638=this.p_FTStemOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStemOption_in_p_FTMatchOption15056);
+                    p_FTStemOption625=this.p_FTStemOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption638.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStemOption625.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1855:11: p_FTCaseOption
+                    // xquery/XQueryParser.g:1857:11: p_FTCaseOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020);
-                    p_FTCaseOption639=this.p_FTCaseOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068);
+                    p_FTCaseOption626=this.p_FTCaseOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption639.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTCaseOption626.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1856:11: p_FTDiacriticsOption
+                    // xquery/XQueryParser.g:1858:11: p_FTDiacriticsOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032);
-                    p_FTDiacriticsOption640=this.p_FTDiacriticsOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080);
+                    p_FTDiacriticsOption627=this.p_FTDiacriticsOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption640.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTDiacriticsOption627.getTree());
 
 
                     break;
                 case 7 :
-                    // xquery/XQueryParser.g:1857:11: p_FTStopWordOption
+                    // xquery/XQueryParser.g:1859:11: p_FTStopWordOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044);
-                    p_FTStopWordOption641=this.p_FTStopWordOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092);
+                    p_FTStopWordOption628=this.p_FTStopWordOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption641.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordOption628.getTree());
 
 
                     break;
                 case 8 :
-                    // xquery/XQueryParser.g:1858:11: p_FTExtensionOption
+                    // xquery/XQueryParser.g:1860:11: p_FTExtensionOption
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056);
-                    p_FTExtensionOption642=this.p_FTExtensionOption();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104);
+                    p_FTExtensionOption629=this.p_FTExtensionOption();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption642.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTExtensionOption629.getTree());
 
 
                     break;
@@ -29007,7 +29051,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1862:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
+    // xquery/XQueryParser.g:1864:1: p_FTCaseOption : ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) ;
     // $ANTLR start "p_FTCaseOption"
     p_FTCaseOption: function() {
         var retval = new XQueryParser.p_FTCaseOption_return();
@@ -29021,11 +29065,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1863:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:9: ( ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE ) )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1863:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
+            // xquery/XQueryParser.g:1865:11: ( (k+= CASE k+= INSENSITIVE ) | (k+= CASE k+= SENSITIVE ) | k+= LOWERCASE | k+= UPPERCASE )
             var alt219=4;
             switch ( this.input.LA(1) ) {
             case CASE:
@@ -29061,10 +29105,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt219) {
                 case 1 :
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:13: (k+= CASE k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1863:14: k+= CASE k+= INSENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15087); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:13: (k+= CASE k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1865:14: k+= CASE k+= INSENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15135); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29072,7 +29116,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15091); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTCaseOption15139); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29087,10 +29131,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:13: (k+= CASE k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1864:14: k+= CASE k+= SENSITIVE
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15109); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:13: (k+= CASE k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1866:14: k+= CASE k+= SENSITIVE
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_FTCaseOption15157); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29098,7 +29142,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15113); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTCaseOption15161); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29113,8 +29157,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1865:13: k+= LOWERCASE
-                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15130); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1867:13: k+= LOWERCASE
+                    k=this.match(this.input,LOWERCASE,XQueryParser.FOLLOW_LOWERCASE_in_p_FTCaseOption15178); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29126,8 +29170,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1866:13: k+= UPPERCASE
-                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15146); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1868:13: k+= UPPERCASE
+                    k=this.match(this.input,UPPERCASE,XQueryParser.FOLLOW_UPPERCASE_in_p_FTCaseOption15194); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29180,7 +29224,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1870:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
+    // xquery/XQueryParser.g:1872:1: p_FTDiacriticsOption : ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) ;
     // $ANTLR start "p_FTDiacriticsOption"
     p_FTDiacriticsOption: function() {
         var retval = new XQueryParser.p_FTDiacriticsOption_return();
@@ -29194,11 +29238,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1871:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:9: ( ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1871:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
+            // xquery/XQueryParser.g:1873:11: ( (k+= DIACRITICS k+= INSENSITIVE ) | (k+= DIACRITICS k+= SENSITIVE ) )
             var alt220=2;
             var LA220_0 = this.input.LA(1);
 
@@ -29228,10 +29272,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt220) {
                 case 1 :
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:13: (k+= DIACRITICS k+= INSENSITIVE )
-                    // xquery/XQueryParser.g:1871:14: k+= DIACRITICS k+= INSENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:13: (k+= DIACRITICS k+= INSENSITIVE )
+                    // xquery/XQueryParser.g:1873:14: k+= DIACRITICS k+= INSENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29239,7 +29283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185); if (this.state.failed) return retval;
+                    k=this.match(this.input,INSENSITIVE,XQueryParser.FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29254,10 +29298,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:13: (k+= DIACRITICS k+= SENSITIVE )
-                    // xquery/XQueryParser.g:1872:14: k+= DIACRITICS k+= SENSITIVE
-                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:13: (k+= DIACRITICS k+= SENSITIVE )
+                    // xquery/XQueryParser.g:1874:14: k+= DIACRITICS k+= SENSITIVE
+                    k=this.match(this.input,DIACRITICS,XQueryParser.FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29265,7 +29309,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207); if (this.state.failed) return retval;
+                    k=this.match(this.input,SENSITIVE,XQueryParser.FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29321,7 +29365,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1876:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
+    // xquery/XQueryParser.g:1878:1: p_FTStemOption : (k+= STEMMING | (k+= NO k+= STEMMING ) ) ;
     // $ANTLR start "p_FTStemOption"
     p_FTStemOption: function() {
         var retval = new XQueryParser.p_FTStemOption_return();
@@ -29335,11 +29379,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1877:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:9: ( (k+= STEMMING | (k+= NO k+= STEMMING ) ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1877:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
+            // xquery/XQueryParser.g:1879:11: (k+= STEMMING | (k+= NO k+= STEMMING ) )
             var alt221=2;
             var LA221_0 = this.input.LA(1);
 
@@ -29358,8 +29402,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt221) {
                 case 1 :
-                    // xquery/XQueryParser.g:1877:13: k+= STEMMING
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15242); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:13: k+= STEMMING
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15290); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29371,10 +29415,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:27: (k+= NO k+= STEMMING )
-                    // xquery/XQueryParser.g:1877:28: k+= NO k+= STEMMING
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15249); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:27: (k+= NO k+= STEMMING )
+                    // xquery/XQueryParser.g:1879:28: k+= NO k+= STEMMING
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStemOption15297); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29382,7 +29426,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15253); if (this.state.failed) return retval;
+                    k=this.match(this.input,STEMMING,XQueryParser.FOLLOW_STEMMING_in_p_FTStemOption15301); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29438,7 +29482,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1881:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
+    // xquery/XQueryParser.g:1883:1: p_FTThesaurusOption : ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) ;
     // $ANTLR start "p_FTThesaurusOption"
     p_FTThesaurusOption: function() {
         var retval = new XQueryParser.p_FTThesaurusOption_return();
@@ -29446,26 +29490,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LPAREN644 = null;
-        var COMMA646 = null;
-        var RPAREN648 = null;
+        var LPAREN631 = null;
+        var COMMA633 = null;
+        var RPAREN635 = null;
         var k = null;
         var list_k=null;
-         var p_FTThesaurusID643 = null;
-         var p_FTThesaurusID645 = null;
-         var p_FTThesaurusID647 = null;
+         var p_FTThesaurusID630 = null;
+         var p_FTThesaurusID632 = null;
+         var p_FTThesaurusID634 = null;
 
-        var LPAREN644_tree=null;
-        var COMMA646_tree=null;
-        var RPAREN648_tree=null;
+        var LPAREN631_tree=null;
+        var COMMA633_tree=null;
+        var RPAREN635_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1882:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:9: ( ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1882:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
+            // xquery/XQueryParser.g:1884:11: ( (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) ) | (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN ) | (k+= NO k+= THESAURUS ) )
             var alt225=3;
             var LA225_0 = this.input.LA(1);
 
@@ -29498,10 +29542,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt225) {
                 case 1 :
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
-                    // xquery/XQueryParser.g:1882:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15289); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:13: (k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT ) )
+                    // xquery/XQueryParser.g:1884:14: k+= THESAURUS ( p_FTThesaurusID | k+= DEFAULT )
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15337); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29509,7 +29553,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1882:27: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1884:27: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt222=2;
                     var LA222_0 = this.input.LA(1);
 
@@ -29528,19 +29572,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt222) {
                         case 1 :
-                            // xquery/XQueryParser.g:1882:28: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292);
-                            p_FTThesaurusID643=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1884:28: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340);
+                            p_FTThesaurusID630=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID643.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID630.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1882:46: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15298); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1884:46: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15346); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29561,10 +29605,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
-                    // xquery/XQueryParser.g:1883:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15317); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:13: (k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN )
+                    // xquery/XQueryParser.g:1885:14: k+= THESAURUS LPAREN ( p_FTThesaurusID | k+= DEFAULT ) ( COMMA p_FTThesaurusID )* RPAREN
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15365); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29572,12 +29616,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    LPAREN644=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15319); if (this.state.failed) return retval;
+                    LPAREN631=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTThesaurusOption15367); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN644_tree = this.adaptor.create(LPAREN644);
-                    this.adaptor.addChild(root_0, LPAREN644_tree);
+                    LPAREN631_tree = this.adaptor.create(LPAREN631);
+                    this.adaptor.addChild(root_0, LPAREN631_tree);
                     }
-                    // xquery/XQueryParser.g:1883:34: ( p_FTThesaurusID | k+= DEFAULT )
+                    // xquery/XQueryParser.g:1885:34: ( p_FTThesaurusID | k+= DEFAULT )
                     var alt223=2;
                     var LA223_0 = this.input.LA(1);
 
@@ -29596,19 +29640,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt223) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:35: p_FTThesaurusID
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322);
-                            p_FTThesaurusID645=this.p_FTThesaurusID();
+                            // xquery/XQueryParser.g:1885:35: p_FTThesaurusID
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370);
+                            p_FTThesaurusID632=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID645.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID632.getTree());
 
 
                             break;
                         case 2 :
-                            // xquery/XQueryParser.g:1883:53: k+= DEFAULT
-                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15328); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:53: k+= DEFAULT
+                            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTThesaurusOption15376); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
                             k_tree = this.adaptor.create(k);
                             this.adaptor.addChild(root_0, k_tree);
@@ -29622,7 +29666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     }
 
-                    // xquery/XQueryParser.g:1883:65: ( COMMA p_FTThesaurusID )*
+                    // xquery/XQueryParser.g:1885:65: ( COMMA p_FTThesaurusID )*
                     loop224:
                     do {
                         var alt224=2;
@@ -29635,18 +29679,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt224) {
                         case 1 :
-                            // xquery/XQueryParser.g:1883:66: COMMA p_FTThesaurusID
-                            COMMA646=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15332); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1885:66: COMMA p_FTThesaurusID
+                            COMMA633=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTThesaurusOption15380); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA646_tree = this.adaptor.create(COMMA646);
-                            this.adaptor.addChild(root_0, COMMA646_tree);
+                            COMMA633_tree = this.adaptor.create(COMMA633);
+                            this.adaptor.addChild(root_0, COMMA633_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334);
-                            p_FTThesaurusID647=this.p_FTThesaurusID();
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382);
+                            p_FTThesaurusID634=this.p_FTThesaurusID();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID647.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTThesaurusID634.getTree());
 
 
                             break;
@@ -29656,10 +29700,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN648=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15338); if (this.state.failed) return retval;
+                    RPAREN635=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTThesaurusOption15386); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN648_tree = this.adaptor.create(RPAREN648);
-                    this.adaptor.addChild(root_0, RPAREN648_tree);
+                    RPAREN635_tree = this.adaptor.create(RPAREN635);
+                    this.adaptor.addChild(root_0, RPAREN635_tree);
                     }
 
 
@@ -29668,10 +29712,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:13: (k+= NO k+= THESAURUS )
-                    // xquery/XQueryParser.g:1884:14: k+= NO k+= THESAURUS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15356); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:13: (k+= NO k+= THESAURUS )
+                    // xquery/XQueryParser.g:1886:14: k+= NO k+= THESAURUS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTThesaurusOption15404); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29679,7 +29723,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15360); if (this.state.failed) return retval;
+                    k=this.match(this.input,THESAURUS,XQueryParser.FOLLOW_THESAURUS_in_p_FTThesaurusOption15408); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29735,7 +29779,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1888:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
+    // xquery/XQueryParser.g:1890:1: p_FTThesaurusID : k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? ;
     // $ANTLR start "p_FTThesaurusID"
     p_FTThesaurusID: function() {
         var retval = new XQueryParser.p_FTThesaurusID_return();
@@ -29745,18 +29789,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_StringLiteral649 = null;
-         var p_StringLiteral650 = null;
-         var p_FTLiteralRange651 = null;
+         var p_StringLiteral636 = null;
+         var p_StringLiteral637 = null;
+         var p_FTLiteralRange638 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1889:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
-            // xquery/XQueryParser.g:1889:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:9: (k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )? )
+            // xquery/XQueryParser.g:1891:11: k+= AT p_StringLiteral (k+= RELATIONSHIP p_StringLiteral )? ( p_FTLiteralRange k+= LEVELS )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15393); if (this.state.failed) return retval;
+            k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTThesaurusID15441); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -29764,13 +29808,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395);
-            p_StringLiteral649=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443);
+            p_StringLiteral636=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral649.getTree());
-            // xquery/XQueryParser.g:1889:33: (k+= RELATIONSHIP p_StringLiteral )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral636.getTree());
+            // xquery/XQueryParser.g:1891:33: (k+= RELATIONSHIP p_StringLiteral )?
             var alt226=2;
             var LA226_0 = this.input.LA(1);
 
@@ -29779,8 +29823,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt226) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:34: k+= RELATIONSHIP p_StringLiteral
-                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1891:34: k+= RELATIONSHIP p_StringLiteral
+                    k=this.match(this.input,RELATIONSHIP,XQueryParser.FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29788,19 +29832,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402);
-                    p_StringLiteral650=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450);
+                    p_StringLiteral637=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral637.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:1889:68: ( p_FTLiteralRange k+= LEVELS )?
+            // xquery/XQueryParser.g:1891:68: ( p_FTLiteralRange k+= LEVELS )?
             var alt227=2;
             var LA227_0 = this.input.LA(1);
 
@@ -29816,14 +29860,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt227) {
                 case 1 :
-                    // xquery/XQueryParser.g:1889:69: p_FTLiteralRange k+= LEVELS
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407);
-                    p_FTLiteralRange651=this.p_FTLiteralRange();
+                    // xquery/XQueryParser.g:1891:69: p_FTLiteralRange k+= LEVELS
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455);
+                    p_FTLiteralRange638=this.p_FTLiteralRange();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange651.getTree());
-                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15411); if (this.state.failed) return retval;
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTLiteralRange638.getTree());
+                    k=this.match(this.input,LEVELS,XQueryParser.FOLLOW_LEVELS_in_p_FTThesaurusID15459); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29876,7 +29920,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1893:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
+    // xquery/XQueryParser.g:1895:1: p_FTLiteralRange : ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) ;
     // $ANTLR start "p_FTLiteralRange"
     p_FTLiteralRange: function() {
         var retval = new XQueryParser.p_FTLiteralRange_return();
@@ -29884,29 +29928,29 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var L_IntegerLiteral652 = null;
-        var L_IntegerLiteral653 = null;
-        var L_IntegerLiteral654 = null;
-        var L_IntegerLiteral655 = null;
-        var TO656 = null;
-        var L_IntegerLiteral657 = null;
+        var L_IntegerLiteral639 = null;
+        var L_IntegerLiteral640 = null;
+        var L_IntegerLiteral641 = null;
+        var L_IntegerLiteral642 = null;
+        var TO643 = null;
+        var L_IntegerLiteral644 = null;
         var k = null;
         var list_k=null;
 
-        var L_IntegerLiteral652_tree=null;
-        var L_IntegerLiteral653_tree=null;
-        var L_IntegerLiteral654_tree=null;
-        var L_IntegerLiteral655_tree=null;
-        var TO656_tree=null;
-        var L_IntegerLiteral657_tree=null;
+        var L_IntegerLiteral639_tree=null;
+        var L_IntegerLiteral640_tree=null;
+        var L_IntegerLiteral641_tree=null;
+        var L_IntegerLiteral642_tree=null;
+        var TO643_tree=null;
+        var L_IntegerLiteral644_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1894:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:9: ( ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1894:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
+            // xquery/XQueryParser.g:1896:11: ( (k+= EXACTLY L_IntegerLiteral ) | (k+= AT k+= LEAST L_IntegerLiteral ) | (k+= AT k+= MOST L_IntegerLiteral ) | (k+= FROM L_IntegerLiteral TO L_IntegerLiteral ) )
             var alt228=4;
             switch ( this.input.LA(1) ) {
             case EXACTLY:
@@ -29942,10 +29986,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt228) {
                 case 1 :
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:13: (k+= EXACTLY L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1894:14: k+= EXACTLY L_IntegerLiteral
-                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15446); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:13: (k+= EXACTLY L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1896:14: k+= EXACTLY L_IntegerLiteral
+                    k=this.match(this.input,EXACTLY,XQueryParser.FOLLOW_EXACTLY_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29953,10 +29997,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral652=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448); if (this.state.failed) return retval;
+                    L_IntegerLiteral639=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral652_tree = this.adaptor.create(L_IntegerLiteral652);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral652_tree);
+                    L_IntegerLiteral639_tree = this.adaptor.create(L_IntegerLiteral639);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral639_tree);
                     }
 
 
@@ -29965,10 +30009,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:13: (k+= AT k+= LEAST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1895:14: k+= AT k+= LEAST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15466); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:13: (k+= AT k+= LEAST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1897:14: k+= AT k+= LEAST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29976,7 +30020,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15470); if (this.state.failed) return retval;
+                    k=this.match(this.input,LEAST,XQueryParser.FOLLOW_LEAST_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -29984,10 +30028,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral653=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472); if (this.state.failed) return retval;
+                    L_IntegerLiteral640=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral653_tree = this.adaptor.create(L_IntegerLiteral653);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral653_tree);
+                    L_IntegerLiteral640_tree = this.adaptor.create(L_IntegerLiteral640);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral640_tree);
                     }
 
 
@@ -29996,10 +30040,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:13: (k+= AT k+= MOST L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1896:14: k+= AT k+= MOST L_IntegerLiteral
-                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15490); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:13: (k+= AT k+= MOST L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1898:14: k+= AT k+= MOST L_IntegerLiteral
+                    k=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTLiteralRange15538); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30007,7 +30051,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15494); if (this.state.failed) return retval;
+                    k=this.match(this.input,MOST,XQueryParser.FOLLOW_MOST_in_p_FTLiteralRange15542); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30015,10 +30059,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral654=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496); if (this.state.failed) return retval;
+                    L_IntegerLiteral641=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral654_tree = this.adaptor.create(L_IntegerLiteral654);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral654_tree);
+                    L_IntegerLiteral641_tree = this.adaptor.create(L_IntegerLiteral641);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral641_tree);
                     }
 
 
@@ -30027,10 +30071,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
-                    // xquery/XQueryParser.g:1897:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
-                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15514); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:13: (k+= FROM L_IntegerLiteral TO L_IntegerLiteral )
+                    // xquery/XQueryParser.g:1899:14: k+= FROM L_IntegerLiteral TO L_IntegerLiteral
+                    k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_FTLiteralRange15562); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30038,20 +30082,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    L_IntegerLiteral655=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516); if (this.state.failed) return retval;
+                    L_IntegerLiteral642=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral655_tree = this.adaptor.create(L_IntegerLiteral655);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral655_tree);
+                    L_IntegerLiteral642_tree = this.adaptor.create(L_IntegerLiteral642);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral642_tree);
                     }
-                    TO656=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15518); if (this.state.failed) return retval;
+                    TO643=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_FTLiteralRange15566); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    TO656_tree = this.adaptor.create(TO656);
-                    this.adaptor.addChild(root_0, TO656_tree);
+                    TO643_tree = this.adaptor.create(TO643);
+                    this.adaptor.addChild(root_0, TO643_tree);
                     }
-                    L_IntegerLiteral657=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520); if (this.state.failed) return retval;
+                    L_IntegerLiteral644=this.match(this.input,L_IntegerLiteral,XQueryParser.FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    L_IntegerLiteral657_tree = this.adaptor.create(L_IntegerLiteral657);
-                    this.adaptor.addChild(root_0, L_IntegerLiteral657_tree);
+                    L_IntegerLiteral644_tree = this.adaptor.create(L_IntegerLiteral644);
+                    this.adaptor.addChild(root_0, L_IntegerLiteral644_tree);
                     }
 
 
@@ -30101,7 +30145,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1901:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
+    // xquery/XQueryParser.g:1903:1: p_FTStopWordOption : ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) ;
     // $ANTLR start "p_FTStopWordOption"
     p_FTStopWordOption: function() {
         var retval = new XQueryParser.p_FTStopWordOption_return();
@@ -30111,18 +30155,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords658 = null;
-         var p_FTStopWordsInclExcl659 = null;
-         var p_FTStopWordsInclExcl660 = null;
+         var p_FTStopWords645 = null;
+         var p_FTStopWordsInclExcl646 = null;
+         var p_FTStopWordsInclExcl647 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1902:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:9: ( ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1902:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
+            // xquery/XQueryParser.g:1904:11: ( (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* ) | (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* ) | (k+= NO k+= STOP k+= WORDS ) )
             var alt231=3;
             var LA231_0 = this.input.LA(1);
 
@@ -30166,10 +30210,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt231) {
                 case 1 :
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1902:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15556); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:13: (k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1904:14: k+= STOP k+= WORDS p_FTStopWords ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15604); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30177,7 +30221,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15560); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15608); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30185,13 +30229,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562);
-                    p_FTStopWords658=this.p_FTStopWords();
+                    this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610);
+                    p_FTStopWords645=this.p_FTStopWords();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords658.getTree());
-                    // xquery/XQueryParser.g:1902:45: ( p_FTStopWordsInclExcl )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords645.getTree());
+                    // xquery/XQueryParser.g:1904:45: ( p_FTStopWordsInclExcl )*
                     loop229:
                     do {
                         var alt229=2;
@@ -30204,13 +30248,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt229) {
                         case 1 :
-                            // xquery/XQueryParser.g:1902:45: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564);
-                            p_FTStopWordsInclExcl659=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1904:45: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612);
+                            p_FTStopWordsInclExcl646=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl659.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl646.getTree());
 
 
                             break;
@@ -30227,10 +30271,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
-                    // xquery/XQueryParser.g:1903:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15583); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:13: (k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )* )
+                    // xquery/XQueryParser.g:1905:14: k+= STOP k+= WORDS k+= DEFAULT ( p_FTStopWordsInclExcl )*
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15631); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30238,7 +30282,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15587); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15635); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30246,7 +30290,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15591); if (this.state.failed) return retval;
+                    k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_FTStopWordOption15639); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30254,7 +30298,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    // xquery/XQueryParser.g:1903:42: ( p_FTStopWordsInclExcl )*
+                    // xquery/XQueryParser.g:1905:42: ( p_FTStopWordsInclExcl )*
                     loop230:
                     do {
                         var alt230=2;
@@ -30267,13 +30311,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt230) {
                         case 1 :
-                            // xquery/XQueryParser.g:1903:42: p_FTStopWordsInclExcl
-                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593);
-                            p_FTStopWordsInclExcl660=this.p_FTStopWordsInclExcl();
+                            // xquery/XQueryParser.g:1905:42: p_FTStopWordsInclExcl
+                            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641);
+                            p_FTStopWordsInclExcl647=this.p_FTStopWordsInclExcl();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl660.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWordsInclExcl647.getTree());
 
 
                             break;
@@ -30290,10 +30334,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:13: (k+= NO k+= STOP k+= WORDS )
-                    // xquery/XQueryParser.g:1904:14: k+= NO k+= STOP k+= WORDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15612); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:13: (k+= NO k+= STOP k+= WORDS )
+                    // xquery/XQueryParser.g:1906:14: k+= NO k+= STOP k+= WORDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTStopWordOption15660); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30301,7 +30345,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15616); if (this.state.failed) return retval;
+                    k=this.match(this.input,STOP,XQueryParser.FOLLOW_STOP_in_p_FTStopWordOption15664); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30309,7 +30353,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15620); if (this.state.failed) return retval;
+                    k=this.match(this.input,WORDS,XQueryParser.FOLLOW_WORDS_in_p_FTStopWordOption15668); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30365,7 +30409,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1908:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
+    // xquery/XQueryParser.g:1910:1: p_FTStopWords : ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) );
     // $ANTLR start "p_FTStopWords"
     p_FTStopWords: function() {
         var retval = new XQueryParser.p_FTStopWords_return();
@@ -30374,20 +30418,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ka = null;
-        var LPAREN662 = null;
-        var COMMA664 = null;
-        var RPAREN666 = null;
-         var p_StringLiteral661 = null;
-         var p_StringLiteral663 = null;
-         var p_StringLiteral665 = null;
+        var LPAREN649 = null;
+        var COMMA651 = null;
+        var RPAREN653 = null;
+         var p_StringLiteral648 = null;
+         var p_StringLiteral650 = null;
+         var p_StringLiteral652 = null;
 
         var ka_tree=null;
-        var LPAREN662_tree=null;
-        var COMMA664_tree=null;
-        var RPAREN666_tree=null;
+        var LPAREN649_tree=null;
+        var COMMA651_tree=null;
+        var RPAREN653_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1909:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
+            // xquery/XQueryParser.g:1911:9: ( (ka= AT p_StringLiteral ) | ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN ) )
             var alt233=2;
             var LA233_0 = this.input.LA(1);
 
@@ -30406,12 +30450,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt233) {
                 case 1 :
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1909:11: (ka= AT p_StringLiteral )
-                    // xquery/XQueryParser.g:1909:12: ka= AT p_StringLiteral
-                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15654); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1911:11: (ka= AT p_StringLiteral )
+                    // xquery/XQueryParser.g:1911:12: ka= AT p_StringLiteral
+                    ka=this.match(this.input,AT,XQueryParser.FOLLOW_AT_in_p_FTStopWords15702); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     ka_tree = this.adaptor.create(ka);
                     this.adaptor.addChild(root_0, ka_tree);
@@ -30419,12 +30463,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(ka);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15658);
-                    p_StringLiteral661=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15706);
+                    p_StringLiteral648=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral661.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral648.getTree());
 
 
 
@@ -30432,23 +30476,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
                     root_0 = this.adaptor.nil();
 
-                    // xquery/XQueryParser.g:1910:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
-                    // xquery/XQueryParser.g:1910:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
-                    LPAREN662=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15672); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1912:11: ( LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN )
+                    // xquery/XQueryParser.g:1912:12: LPAREN p_StringLiteral ( COMMA p_StringLiteral )* RPAREN
+                    LPAREN649=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_FTStopWords15720); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    LPAREN662_tree = this.adaptor.create(LPAREN662);
-                    this.adaptor.addChild(root_0, LPAREN662_tree);
+                    LPAREN649_tree = this.adaptor.create(LPAREN649);
+                    this.adaptor.addChild(root_0, LPAREN649_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15674);
-                    p_StringLiteral663=this.p_StringLiteral();
+                    this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15722);
+                    p_StringLiteral650=this.p_StringLiteral();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral663.getTree());
-                    // xquery/XQueryParser.g:1910:35: ( COMMA p_StringLiteral )*
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral650.getTree());
+                    // xquery/XQueryParser.g:1912:35: ( COMMA p_StringLiteral )*
                     loop232:
                     do {
                         var alt232=2;
@@ -30461,18 +30505,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                         switch (alt232) {
                         case 1 :
-                            // xquery/XQueryParser.g:1910:36: COMMA p_StringLiteral
-                            COMMA664=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15677); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:1912:36: COMMA p_StringLiteral
+                            COMMA651=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_FTStopWords15725); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            COMMA664_tree = this.adaptor.create(COMMA664);
-                            this.adaptor.addChild(root_0, COMMA664_tree);
+                            COMMA651_tree = this.adaptor.create(COMMA651);
+                            this.adaptor.addChild(root_0, COMMA651_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15679);
-                            p_StringLiteral665=this.p_StringLiteral();
+                            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTStopWords15727);
+                            p_StringLiteral652=this.p_StringLiteral();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral665.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral652.getTree());
 
 
                             break;
@@ -30482,10 +30526,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                         }
                     } while (true);
 
-                    RPAREN666=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15683); if (this.state.failed) return retval;
+                    RPAREN653=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_FTStopWords15731); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    RPAREN666_tree = this.adaptor.create(RPAREN666);
-                    this.adaptor.addChild(root_0, RPAREN666_tree);
+                    RPAREN653_tree = this.adaptor.create(RPAREN653);
+                    this.adaptor.addChild(root_0, RPAREN653_tree);
                     }
 
 
@@ -30528,7 +30572,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1914:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
+    // xquery/XQueryParser.g:1916:1: p_FTStopWordsInclExcl : ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) ;
     // $ANTLR start "p_FTStopWordsInclExcl"
     p_FTStopWordsInclExcl: function() {
         var retval = new XQueryParser.p_FTStopWordsInclExcl_return();
@@ -30538,18 +30582,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_FTStopWords667 = null;
+         var p_FTStopWords654 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1915:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:9: ( ( (k+= UNION | k+= EXCEPT ) p_FTStopWords ) )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1915:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
-            // xquery/XQueryParser.g:1915:13: (k+= UNION | k+= EXCEPT )
+            // xquery/XQueryParser.g:1917:11: ( (k+= UNION | k+= EXCEPT ) p_FTStopWords )
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT ) p_FTStopWords
+            // xquery/XQueryParser.g:1917:13: (k+= UNION | k+= EXCEPT )
             var alt234=2;
             var LA234_0 = this.input.LA(1);
 
@@ -30568,8 +30612,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt234) {
                 case 1 :
-                    // xquery/XQueryParser.g:1915:14: k+= UNION
-                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15715); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:14: k+= UNION
+                    k=this.match(this.input,UNION,XQueryParser.FOLLOW_UNION_in_p_FTStopWordsInclExcl15763); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30581,8 +30625,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1915:25: k+= EXCEPT
-                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1917:25: k+= EXCEPT
+                    k=this.match(this.input,EXCEPT,XQueryParser.FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30596,12 +30640,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724);
-            p_FTStopWords667=this.p_FTStopWords();
+            this.pushFollow(XQueryParser.FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772);
+            p_FTStopWords654=this.p_FTStopWords();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords667.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_FTStopWords654.getTree());
 
 
 
@@ -30644,7 +30688,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1919:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
+    // xquery/XQueryParser.g:1921:1: p_FTLanguageOption : kl= LANGUAGE p_StringLiteral ;
     // $ANTLR start "p_FTLanguageOption"
     p_FTLanguageOption: function() {
         var retval = new XQueryParser.p_FTLanguageOption_return();
@@ -30653,16 +30697,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var kl = null;
-         var p_StringLiteral668 = null;
+         var p_StringLiteral655 = null;
 
         var kl_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1920:9: (kl= LANGUAGE p_StringLiteral )
-            // xquery/XQueryParser.g:1920:11: kl= LANGUAGE p_StringLiteral
+            // xquery/XQueryParser.g:1922:9: (kl= LANGUAGE p_StringLiteral )
+            // xquery/XQueryParser.g:1922:11: kl= LANGUAGE p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15756); if (this.state.failed) return retval;
+            kl=this.match(this.input,LANGUAGE,XQueryParser.FOLLOW_LANGUAGE_in_p_FTLanguageOption15804); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             kl_tree = this.adaptor.create(kl);
             this.adaptor.addChild(root_0, kl_tree);
@@ -30670,12 +30714,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(kl);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760);
-            p_StringLiteral668=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808);
+            p_StringLiteral655=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral668.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral655.getTree());
 
 
 
@@ -30712,7 +30756,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1924:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
+    // xquery/XQueryParser.g:1926:1: p_FTWildCardOption : (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) ;
     // $ANTLR start "p_FTWildCardOption"
     p_FTWildCardOption: function() {
         var retval = new XQueryParser.p_FTWildCardOption_return();
@@ -30726,11 +30770,11 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1925:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:9: ( (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1925:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
+            // xquery/XQueryParser.g:1927:11: (k+= WILDCARDS | (k+= NO k+= WILDCARDS ) )
             var alt235=2;
             var LA235_0 = this.input.LA(1);
 
@@ -30749,8 +30793,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt235) {
                 case 1 :
-                    // xquery/XQueryParser.g:1925:13: k+= WILDCARDS
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15790); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:13: k+= WILDCARDS
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15838); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30762,10 +30806,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:28: (k+= NO k+= WILDCARDS )
-                    // xquery/XQueryParser.g:1925:29: k+= NO k+= WILDCARDS
-                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15797); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:28: (k+= NO k+= WILDCARDS )
+                    // xquery/XQueryParser.g:1927:29: k+= NO k+= WILDCARDS
+                    k=this.match(this.input,NO,XQueryParser.FOLLOW_NO_in_p_FTWildCardOption15845); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30773,7 +30817,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if (org.antlr.lang.isNull(list_k)) list_k = [];
                     list_k.push(k);
 
-                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15801); if (this.state.failed) return retval;
+                    k=this.match(this.input,WILDCARDS,XQueryParser.FOLLOW_WILDCARDS_in_p_FTWildCardOption15849); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -30829,7 +30873,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1929:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
+    // xquery/XQueryParser.g:1931:1: p_FTExtensionOption : ko= OPTION p_QName p_StringLiteral ;
     // $ANTLR start "p_FTExtensionOption"
     p_FTExtensionOption: function() {
         var retval = new XQueryParser.p_FTExtensionOption_return();
@@ -30838,17 +30882,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var ko = null;
-         var p_QName669 = null;
-         var p_StringLiteral670 = null;
+         var p_QName656 = null;
+         var p_StringLiteral657 = null;
 
         var ko_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1930:9: (ko= OPTION p_QName p_StringLiteral )
-            // xquery/XQueryParser.g:1930:11: ko= OPTION p_QName p_StringLiteral
+            // xquery/XQueryParser.g:1932:9: (ko= OPTION p_QName p_StringLiteral )
+            // xquery/XQueryParser.g:1932:11: ko= OPTION p_QName p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15834); if (this.state.failed) return retval;
+            ko=this.match(this.input,OPTION,XQueryParser.FOLLOW_OPTION_in_p_FTExtensionOption15882); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             ko_tree = this.adaptor.create(ko);
             this.adaptor.addChild(root_0, ko_tree);
@@ -30856,18 +30900,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(ko);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15838);
-            p_QName669=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_FTExtensionOption15886);
+            p_QName656=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName669.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840);
-            p_StringLiteral670=this.p_StringLiteral();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName656.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888);
+            p_StringLiteral657=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral670.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral657.getTree());
 
 
 
@@ -30904,7 +30948,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1934:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
+    // xquery/XQueryParser.g:1936:1: p_FTIgnoreOption : k+= WITHOUT k+= CONTENT p_UnionExpr ;
     // $ANTLR start "p_FTIgnoreOption"
     p_FTIgnoreOption: function() {
         var retval = new XQueryParser.p_FTIgnoreOption_return();
@@ -30914,16 +30958,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var list_k=null;
-         var p_UnionExpr671 = null;
+         var p_UnionExpr658 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1935:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
-            // xquery/XQueryParser.g:1935:11: k+= WITHOUT k+= CONTENT p_UnionExpr
+            // xquery/XQueryParser.g:1937:9: (k+= WITHOUT k+= CONTENT p_UnionExpr )
+            // xquery/XQueryParser.g:1937:11: k+= WITHOUT k+= CONTENT p_UnionExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15868); if (this.state.failed) return retval;
+            k=this.match(this.input,WITHOUT,XQueryParser.FOLLOW_WITHOUT_in_p_FTIgnoreOption15916); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30931,7 +30975,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if (org.antlr.lang.isNull(list_k)) list_k = [];
             list_k.push(k);
 
-            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15872); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTENT,XQueryParser.FOLLOW_CONTENT_in_p_FTIgnoreOption15920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -30942,12 +30986,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(list_k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876);
-            p_UnionExpr671=this.p_UnionExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924);
+            p_UnionExpr658=this.p_UnionExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr671.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_UnionExpr658.getTree());
 
 
 
@@ -30984,7 +31028,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1945:1: p_Program : p_StatementsAndOptionalExpr ;
+    // xquery/XQueryParser.g:1947:1: p_Program : p_StatementsAndOptionalExpr ;
     // $ANTLR start "p_Program"
     p_Program: function() {
         var retval = new XQueryParser.p_Program_return();
@@ -30992,20 +31036,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_StatementsAndOptionalExpr672 = null;
+         var p_StatementsAndOptionalExpr659 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1946:9: ( p_StatementsAndOptionalExpr )
-            // xquery/XQueryParser.g:1946:11: p_StatementsAndOptionalExpr
+            // xquery/XQueryParser.g:1948:9: ( p_StatementsAndOptionalExpr )
+            // xquery/XQueryParser.g:1948:11: p_StatementsAndOptionalExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908);
-            p_StatementsAndOptionalExpr672=this.p_StatementsAndOptionalExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956);
+            p_StatementsAndOptionalExpr659=this.p_StatementsAndOptionalExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr672.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndOptionalExpr659.getTree());
 
 
 
@@ -31042,7 +31086,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1950:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
+    // xquery/XQueryParser.g:1952:1: p_Statements[strict] : ( p_Hybrid[$strict,true] )* ;
     // $ANTLR start "p_Statements"
     p_Statements: function(strict) {
         var retval = new XQueryParser.p_Statements_return();
@@ -31050,15 +31094,15 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Hybrid673 = null;
+         var p_Hybrid660 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1951:9: ( ( p_Hybrid[$strict,true] )* )
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:9: ( ( p_Hybrid[$strict,true] )* )
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:1951:11: ( p_Hybrid[$strict,true] )*
+            // xquery/XQueryParser.g:1953:11: ( p_Hybrid[$strict,true] )*
             loop236:
             do {
                 var alt236=2;
@@ -31071,13 +31115,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt236) {
                 case 1 :
-                    // xquery/XQueryParser.g:1951:11: p_Hybrid[$strict,true]
-                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15935);
-                    p_Hybrid673=this.p_Hybrid(strict, true);
+                    // xquery/XQueryParser.g:1953:11: p_Hybrid[$strict,true]
+                    this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_Statements15983);
+                    p_Hybrid660=this.p_Hybrid(strict, true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid673.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid660.getTree());
 
 
                     break;
@@ -31123,7 +31167,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1955:1: p_StatementsAndExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1957:1: p_StatementsAndExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndExpr"
     p_StatementsAndExpr: function() {
         var retval = new XQueryParser.p_StatementsAndExpr_return();
@@ -31131,20 +31175,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements674 = null;
+         var p_Statements661 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1956:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1956:11: p_Statements[false]
+            // xquery/XQueryParser.g:1958:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1958:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr15963);
-            p_Statements674=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndExpr16011);
+            p_Statements661=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements674.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements661.getTree());
 
 
 
@@ -31181,7 +31225,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1960:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
+    // xquery/XQueryParser.g:1962:1: p_StatementsAndOptionalExpr : p_Statements[false] ;
     // $ANTLR start "p_StatementsAndOptionalExpr"
     p_StatementsAndOptionalExpr: function() {
         var retval = new XQueryParser.p_StatementsAndOptionalExpr_return();
@@ -31189,20 +31233,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_Statements675 = null;
+         var p_Statements662 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1961:9: ( p_Statements[false] )
-            // xquery/XQueryParser.g:1961:11: p_Statements[false]
+            // xquery/XQueryParser.g:1963:9: ( p_Statements[false] )
+            // xquery/XQueryParser.g:1963:11: p_Statements[false]
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990);
-            p_Statements675=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038);
+            p_Statements662=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements675.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements662.getTree());
 
 
 
@@ -31239,7 +31283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
+    // xquery/XQueryParser.g:1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );
     // $ANTLR start "p_Hybrid"
     p_Hybrid: function(strict, allowConcat) {
         var retval = new XQueryParser.p_Hybrid_return();
@@ -31247,38 +31291,38 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_HybridExprSingle676 = null;
-         var p_Statement677 = null;
+         var p_HybridExprSingle663 = null;
+         var p_Statement664 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1965:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
+            // xquery/XQueryParser.g:1967:9: ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement )
             var alt237=2;
             alt237 = this.dfa237.predict(this.input);
             switch (alt237) {
                 case 1 :
-                    // xquery/XQueryParser.g:1965:11: p_HybridExprSingle[$strict,$allowConcat]
+                    // xquery/XQueryParser.g:1967:11: p_HybridExprSingle[$strict,$allowConcat]
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16017);
-                    p_HybridExprSingle676=this.p_HybridExprSingle(strict, allowConcat);
+                    this.pushFollow(XQueryParser.FOLLOW_p_HybridExprSingle_in_p_Hybrid16065);
+                    p_HybridExprSingle663=this.p_HybridExprSingle(strict, allowConcat);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle676.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_HybridExprSingle663.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1966:11: p_Statement
+                    // xquery/XQueryParser.g:1968:11: p_Statement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16030);
-                    p_Statement677=this.p_Statement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_Statement_in_p_Hybrid16078);
+                    p_Statement664=this.p_Statement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement677.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statement664.getTree());
 
 
                     break;
@@ -31323,7 +31367,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1982:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
+    // xquery/XQueryParser.g:1984:1: p_Statement : ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement );
     // $ANTLR start "p_Statement"
     p_Statement: function() {
         var retval = new XQueryParser.p_Statement_return();
@@ -31331,16 +31375,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_AssignStatement678 = null;
-         var p_BreakStatement679 = null;
-         var p_ContinueStatement680 = null;
-         var p_ExitStatement681 = null;
-         var p_VarDeclStatement682 = null;
-         var p_WhileStatement683 = null;
+         var p_AssignStatement665 = null;
+         var p_BreakStatement666 = null;
+         var p_ContinueStatement667 = null;
+         var p_ExitStatement668 = null;
+         var p_VarDeclStatement669 = null;
+         var p_WhileStatement670 = null;
 
 
         try {
-            // xquery/XQueryParser.g:1983:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
+            // xquery/XQueryParser.g:1985:9: ( p_AssignStatement | p_BreakStatement | p_ContinueStatement | p_ExitStatement | p_VarDeclStatement | p_WhileStatement )
             var alt238=6;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -31372,80 +31416,80 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt238) {
                 case 1 :
-                    // xquery/XQueryParser.g:1983:11: p_AssignStatement
+                    // xquery/XQueryParser.g:1985:11: p_AssignStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16061);
-                    p_AssignStatement678=this.p_AssignStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_AssignStatement_in_p_Statement16109);
+                    p_AssignStatement665=this.p_AssignStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement678.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AssignStatement665.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:1984:11: p_BreakStatement
+                    // xquery/XQueryParser.g:1986:11: p_BreakStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16073);
-                    p_BreakStatement679=this.p_BreakStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_BreakStatement_in_p_Statement16121);
+                    p_BreakStatement666=this.p_BreakStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement679.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BreakStatement666.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:1985:11: p_ContinueStatement
+                    // xquery/XQueryParser.g:1987:11: p_ContinueStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16085);
-                    p_ContinueStatement680=this.p_ContinueStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ContinueStatement_in_p_Statement16133);
+                    p_ContinueStatement667=this.p_ContinueStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement680.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ContinueStatement667.getTree());
 
 
                     break;
                 case 4 :
-                    // xquery/XQueryParser.g:1986:11: p_ExitStatement
+                    // xquery/XQueryParser.g:1988:11: p_ExitStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16097);
-                    p_ExitStatement681=this.p_ExitStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExitStatement_in_p_Statement16145);
+                    p_ExitStatement668=this.p_ExitStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement681.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExitStatement668.getTree());
 
 
                     break;
                 case 5 :
-                    // xquery/XQueryParser.g:1987:11: p_VarDeclStatement
+                    // xquery/XQueryParser.g:1989:11: p_VarDeclStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16109);
-                    p_VarDeclStatement682=this.p_VarDeclStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarDeclStatement_in_p_Statement16157);
+                    p_VarDeclStatement669=this.p_VarDeclStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement682.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_VarDeclStatement669.getTree());
 
 
                     break;
                 case 6 :
-                    // xquery/XQueryParser.g:1988:11: p_WhileStatement
+                    // xquery/XQueryParser.g:1990:11: p_WhileStatement
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16121);
-                    p_WhileStatement683=this.p_WhileStatement();
+                    this.pushFollow(XQueryParser.FOLLOW_p_WhileStatement_in_p_Statement16169);
+                    p_WhileStatement670=this.p_WhileStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement683.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_WhileStatement670.getTree());
 
 
                     break;
@@ -31484,7 +31528,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:1990:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
+    // xquery/XQueryParser.g:1992:1: p_HybridExprSingle[strict, allowConcat] : e= p_Expr[$strict,$allowConcat] SEMICOLON ;
     // $ANTLR start "p_HybridExprSingle"
     p_HybridExprSingle: function(strict, allowConcat) {
         var retval = new XQueryParser.p_HybridExprSingle_return();
@@ -31492,17 +31536,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON684 = null;
+        var SEMICOLON671 = null;
          var e = null;
 
-        var SEMICOLON684_tree=null;
+        var SEMICOLON671_tree=null;
 
         try {
-            // xquery/XQueryParser.g:1991:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
-            // xquery/XQueryParser.g:1991:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
+            // xquery/XQueryParser.g:1993:9: (e= p_Expr[$strict,$allowConcat] SEMICOLON )
+            // xquery/XQueryParser.g:1993:11: e= p_Expr[$strict,$allowConcat] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16148);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_HybridExprSingle16196);
             e=this.p_Expr(strict, allowConcat);
 
             this.state._fsp--;
@@ -31511,10 +31555,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                if (strict || this.input.LT(1).getType() != SEMICOLON) throw new org.antlr.runtime.RecognitionException(this.input); 
             }
-            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16163); if (this.state.failed) return retval;
+            SEMICOLON671=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_HybridExprSingle16211); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
-            this.adaptor.addChild(root_0, SEMICOLON684_tree);
+            SEMICOLON671_tree = this.adaptor.create(SEMICOLON671);
+            this.adaptor.addChild(root_0, SEMICOLON671_tree);
             }
 
 
@@ -31557,7 +31601,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2026:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
+    // xquery/XQueryParser.g:2028:1: p_ApplyStatement : p_ExprSimple SEMICOLON ;
     // $ANTLR start "p_ApplyStatement"
     p_ApplyStatement: function() {
         var retval = new XQueryParser.p_ApplyStatement_return();
@@ -31565,26 +31609,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var SEMICOLON686 = null;
-         var p_ExprSimple685 = null;
+        var SEMICOLON673 = null;
+         var p_ExprSimple672 = null;
 
-        var SEMICOLON686_tree=null;
+        var SEMICOLON673_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2027:9: ( p_ExprSimple SEMICOLON )
-            // xquery/XQueryParser.g:2027:11: p_ExprSimple SEMICOLON
+            // xquery/XQueryParser.g:2029:9: ( p_ExprSimple SEMICOLON )
+            // xquery/XQueryParser.g:2029:11: p_ExprSimple SEMICOLON
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16213);
-            p_ExprSimple685=this.p_ExprSimple();
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSimple_in_p_ApplyStatement16261);
+            p_ExprSimple672=this.p_ExprSimple();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple685.getTree());
-            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16215); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSimple672.getTree());
+            SEMICOLON673=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ApplyStatement16263); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
-            this.adaptor.addChild(root_0, SEMICOLON686_tree);
+            SEMICOLON673_tree = this.adaptor.create(SEMICOLON673);
+            this.adaptor.addChild(root_0, SEMICOLON673_tree);
             }
 
 
@@ -31622,7 +31666,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2031:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2033:1: p_AssignStatement : d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_AssignStatement"
     p_AssignStatement: function() {
         var retval = new XQueryParser.p_AssignStatement_return();
@@ -31631,26 +31675,26 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var d = null;
-        var BIND687 = null;
-        var SEMICOLON689 = null;
+        var BIND674 = null;
+        var SEMICOLON676 = null;
          var v = null;
-         var p_ExprSingle688 = null;
+         var p_ExprSingle675 = null;
 
         var d_tree=null;
-        var BIND687_tree=null;
-        var SEMICOLON689_tree=null;
+        var BIND674_tree=null;
+        var SEMICOLON676_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2032:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2032:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2034:9: (d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2034:11: d= DOLLAR v= p_VarName BIND p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16243); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_AssignStatement16291); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16247);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_AssignStatement16295);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -31659,21 +31703,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            BIND687=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16251); if (this.state.failed) return retval;
+            BIND674=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_AssignStatement16299); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            BIND687_tree = this.adaptor.create(BIND687);
-            this.adaptor.addChild(root_0, BIND687_tree);
+            BIND674_tree = this.adaptor.create(BIND674);
+            this.adaptor.addChild(root_0, BIND674_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16253);
-            p_ExprSingle688=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_AssignStatement16301);
+            p_ExprSingle675=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle688.getTree());
-            SEMICOLON689=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16256); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle675.getTree());
+            SEMICOLON676=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_AssignStatement16304); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON689_tree = this.adaptor.create(SEMICOLON689);
-            this.adaptor.addChild(root_0, SEMICOLON689_tree);
+            SEMICOLON676_tree = this.adaptor.create(SEMICOLON676);
+            this.adaptor.addChild(root_0, SEMICOLON676_tree);
             }
 
 
@@ -31711,7 +31755,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2036:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
+    // xquery/XQueryParser.g:2038:1: p_BlockStatement : LBRACKET p_Statements[false] RBRACKET ;
     // $ANTLR start "p_BlockStatement"
     p_BlockStatement: function() {
         var retval = new XQueryParser.p_BlockStatement_return();
@@ -31719,33 +31763,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET690 = null;
-        var RBRACKET692 = null;
-         var p_Statements691 = null;
+        var LBRACKET677 = null;
+        var RBRACKET679 = null;
+         var p_Statements678 = null;
 
-        var LBRACKET690_tree=null;
-        var RBRACKET692_tree=null;
+        var LBRACKET677_tree=null;
+        var RBRACKET679_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2037:9: ( LBRACKET p_Statements[false] RBRACKET )
-            // xquery/XQueryParser.g:2037:11: LBRACKET p_Statements[false] RBRACKET
+            // xquery/XQueryParser.g:2039:9: ( LBRACKET p_Statements[false] RBRACKET )
+            // xquery/XQueryParser.g:2039:11: LBRACKET p_Statements[false] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET690=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16282); if (this.state.failed) return retval;
+            LBRACKET677=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockStatement16330); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET690_tree = this.adaptor.create(LBRACKET690);
-            this.adaptor.addChild(root_0, LBRACKET690_tree);
+            LBRACKET677_tree = this.adaptor.create(LBRACKET677);
+            this.adaptor.addChild(root_0, LBRACKET677_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16284);
-            p_Statements691=this.p_Statements(false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockStatement16332);
+            p_Statements678=this.p_Statements(false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements691.getTree());
-            RBRACKET692=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16287); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements678.getTree());
+            RBRACKET679=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockStatement16335); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET692_tree = this.adaptor.create(RBRACKET692);
-            this.adaptor.addChild(root_0, RBRACKET692_tree);
+            RBRACKET679_tree = this.adaptor.create(RBRACKET679);
+            this.adaptor.addChild(root_0, RBRACKET679_tree);
             }
 
 
@@ -31783,7 +31827,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2040:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
+    // xquery/XQueryParser.g:2042:1: p_BlockHybrid[strict] : LBRACKET p_Statements[$strict] RBRACKET ;
     // $ANTLR start "p_BlockHybrid"
     p_BlockHybrid: function(strict) {
         var retval = new XQueryParser.p_BlockHybrid_return();
@@ -31791,33 +31835,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET693 = null;
-        var RBRACKET695 = null;
-         var p_Statements694 = null;
+        var LBRACKET680 = null;
+        var RBRACKET682 = null;
+         var p_Statements681 = null;
 
-        var LBRACKET693_tree=null;
-        var RBRACKET695_tree=null;
+        var LBRACKET680_tree=null;
+        var RBRACKET682_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2041:9: ( LBRACKET p_Statements[$strict] RBRACKET )
-            // xquery/XQueryParser.g:2041:11: LBRACKET p_Statements[$strict] RBRACKET
+            // xquery/XQueryParser.g:2043:9: ( LBRACKET p_Statements[$strict] RBRACKET )
+            // xquery/XQueryParser.g:2043:11: LBRACKET p_Statements[$strict] RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET693=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16313); if (this.state.failed) return retval;
+            LBRACKET680=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockHybrid16361); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET693_tree = this.adaptor.create(LBRACKET693);
-            this.adaptor.addChild(root_0, LBRACKET693_tree);
+            LBRACKET680_tree = this.adaptor.create(LBRACKET680);
+            this.adaptor.addChild(root_0, LBRACKET680_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16315);
-            p_Statements694=this.p_Statements(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_Statements_in_p_BlockHybrid16363);
+            p_Statements681=this.p_Statements(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements694.getTree());
-            RBRACKET695=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16318); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Statements681.getTree());
+            RBRACKET682=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockHybrid16366); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET695_tree = this.adaptor.create(RBRACKET695);
-            this.adaptor.addChild(root_0, RBRACKET695_tree);
+            RBRACKET682_tree = this.adaptor.create(RBRACKET682);
+            this.adaptor.addChild(root_0, RBRACKET682_tree);
             }
 
 
@@ -31855,7 +31899,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2045:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2047:1: p_BreakStatement : k= BREAK k= LOOP SEMICOLON ;
     // $ANTLR start "p_BreakStatement"
     p_BreakStatement: function() {
         var retval = new XQueryParser.p_BreakStatement_return();
@@ -31864,17 +31908,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON696 = null;
+        var SEMICOLON683 = null;
 
         var k_tree=null;
-        var SEMICOLON696_tree=null;
+        var SEMICOLON683_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2046:9: (k= BREAK k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2046:11: k= BREAK k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2048:9: (k= BREAK k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2048:11: k= BREAK k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16346); if (this.state.failed) return retval;
+            k=this.match(this.input,BREAK,XQueryParser.FOLLOW_BREAK_in_p_BreakStatement16394); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -31882,7 +31926,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16352); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_BreakStatement16400); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -31890,10 +31934,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON696=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16356); if (this.state.failed) return retval;
+            SEMICOLON683=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_BreakStatement16404); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON696_tree = this.adaptor.create(SEMICOLON696);
-            this.adaptor.addChild(root_0, SEMICOLON696_tree);
+            SEMICOLON683_tree = this.adaptor.create(SEMICOLON683);
+            this.adaptor.addChild(root_0, SEMICOLON683_tree);
             }
 
 
@@ -31931,7 +31975,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2050:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
+    // xquery/XQueryParser.g:2052:1: p_ContinueStatement : k= CONTINUE k= LOOP SEMICOLON ;
     // $ANTLR start "p_ContinueStatement"
     p_ContinueStatement: function() {
         var retval = new XQueryParser.p_ContinueStatement_return();
@@ -31940,17 +31984,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON697 = null;
+        var SEMICOLON684 = null;
 
         var k_tree=null;
-        var SEMICOLON697_tree=null;
+        var SEMICOLON684_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2051:9: (k= CONTINUE k= LOOP SEMICOLON )
-            // xquery/XQueryParser.g:2051:11: k= CONTINUE k= LOOP SEMICOLON
+            // xquery/XQueryParser.g:2053:9: (k= CONTINUE k= LOOP SEMICOLON )
+            // xquery/XQueryParser.g:2053:11: k= CONTINUE k= LOOP SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16384); if (this.state.failed) return retval;
+            k=this.match(this.input,CONTINUE,XQueryParser.FOLLOW_CONTINUE_in_p_ContinueStatement16432); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -31958,7 +32002,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16390); if (this.state.failed) return retval;
+            k=this.match(this.input,LOOP,XQueryParser.FOLLOW_LOOP_in_p_ContinueStatement16438); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -31966,10 +32010,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            SEMICOLON697=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16394); if (this.state.failed) return retval;
+            SEMICOLON684=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ContinueStatement16442); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON697_tree = this.adaptor.create(SEMICOLON697);
-            this.adaptor.addChild(root_0, SEMICOLON697_tree);
+            SEMICOLON684_tree = this.adaptor.create(SEMICOLON684);
+            this.adaptor.addChild(root_0, SEMICOLON684_tree);
             }
 
 
@@ -32007,7 +32051,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2055:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
+    // xquery/XQueryParser.g:2057:1: p_ExitStatement : k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON ;
     // $ANTLR start "p_ExitStatement"
     p_ExitStatement: function() {
         var retval = new XQueryParser.p_ExitStatement_return();
@@ -32016,18 +32060,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var SEMICOLON699 = null;
-         var p_ExprSingle698 = null;
+        var SEMICOLON686 = null;
+         var p_ExprSingle685 = null;
 
         var k_tree=null;
-        var SEMICOLON699_tree=null;
+        var SEMICOLON686_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2056:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
-            // xquery/XQueryParser.g:2056:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
+            // xquery/XQueryParser.g:2058:9: (k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON )
+            // xquery/XQueryParser.g:2058:11: k= EXIT k= RETURNING p_ExprSingle[true] SEMICOLON
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16422); if (this.state.failed) return retval;
+            k=this.match(this.input,EXIT,XQueryParser.FOLLOW_EXIT_in_p_ExitStatement16470); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32035,7 +32079,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16428); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURNING,XQueryParser.FOLLOW_RETURNING_in_p_ExitStatement16476); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32043,16 +32087,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16432);
-            p_ExprSingle698=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ExitStatement16480);
+            p_ExprSingle685=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle698.getTree());
-            SEMICOLON699=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16435); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle685.getTree());
+            SEMICOLON686=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_ExitStatement16483); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON699_tree = this.adaptor.create(SEMICOLON699);
-            this.adaptor.addChild(root_0, SEMICOLON699_tree);
+            SEMICOLON686_tree = this.adaptor.create(SEMICOLON686);
+            this.adaptor.addChild(root_0, SEMICOLON686_tree);
             }
 
 
@@ -32090,7 +32134,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2060:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
+    // xquery/XQueryParser.g:2062:1: p_FLWORStatement : p_InitialClause ( p_IntermediateClause )* p_ReturnStatement ;
     // $ANTLR start "p_FLWORStatement"
     p_FLWORStatement: function() {
         var retval = new XQueryParser.p_FLWORStatement_return();
@@ -32098,23 +32142,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_InitialClause700 = null;
-         var p_IntermediateClause701 = null;
-         var p_ReturnStatement702 = null;
+         var p_InitialClause687 = null;
+         var p_IntermediateClause688 = null;
+         var p_ReturnStatement689 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2061:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
-            // xquery/XQueryParser.g:2061:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
+            // xquery/XQueryParser.g:2063:9: ( p_InitialClause ( p_IntermediateClause )* p_ReturnStatement )
+            // xquery/XQueryParser.g:2063:11: p_InitialClause ( p_IntermediateClause )* p_ReturnStatement
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16461);
-            p_InitialClause700=this.p_InitialClause();
+            this.pushFollow(XQueryParser.FOLLOW_p_InitialClause_in_p_FLWORStatement16509);
+            p_InitialClause687=this.p_InitialClause();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause700.getTree());
-            // xquery/XQueryParser.g:2061:27: ( p_IntermediateClause )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_InitialClause687.getTree());
+            // xquery/XQueryParser.g:2063:27: ( p_IntermediateClause )*
             loop239:
             do {
                 var alt239=2;
@@ -32127,13 +32171,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt239) {
                 case 1 :
-                    // xquery/XQueryParser.g:2061:27: p_IntermediateClause
-                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463);
-                    p_IntermediateClause701=this.p_IntermediateClause();
+                    // xquery/XQueryParser.g:2063:27: p_IntermediateClause
+                    this.pushFollow(XQueryParser.FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511);
+                    p_IntermediateClause688=this.p_IntermediateClause();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause701.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IntermediateClause688.getTree());
 
 
                     break;
@@ -32143,12 +32187,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466);
-            p_ReturnStatement702=this.p_ReturnStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514);
+            p_ReturnStatement689=this.p_ReturnStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement702.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ReturnStatement689.getTree());
 
 
 
@@ -32185,7 +32229,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2065:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2067:1: p_ReturnStatement : k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_ReturnStatement"
     p_ReturnStatement: function() {
         var retval = new XQueryParser.p_ReturnStatement_return();
@@ -32194,16 +32238,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_Hybrid703 = null;
+         var p_Hybrid690 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2066:9: (k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2066:11: k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2068:9: (k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2068:11: k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16498); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_ReturnStatement16546); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32211,12 +32255,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16502);
-            p_Hybrid703=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_ReturnStatement16550);
+            p_Hybrid690=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid703.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid690.getTree());
 
 
 
@@ -32253,7 +32297,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2070:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2072:1: p_IfStatement : k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] ;
     // $ANTLR start "p_IfStatement"
     p_IfStatement: function() {
         var retval = new XQueryParser.p_IfStatement_return();
@@ -32262,22 +32306,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN704 = null;
-        var RPAREN706 = null;
-         var p_Expr705 = null;
-         var p_Hybrid707 = null;
-         var p_Hybrid708 = null;
+        var LPAREN691 = null;
+        var RPAREN693 = null;
+         var p_Expr692 = null;
+         var p_Hybrid694 = null;
+         var p_Hybrid695 = null;
 
         var k_tree=null;
-        var LPAREN704_tree=null;
-        var RPAREN706_tree=null;
+        var LPAREN691_tree=null;
+        var RPAREN693_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2071:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2071:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2073:9: (k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2073:11: k= IF LPAREN p_Expr[true,true] RPAREN k= THEN p_Hybrid[false,false] k= ELSE p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16531); if (this.state.failed) return retval;
+            k=this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_p_IfStatement16579); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32285,23 +32329,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN704=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16535); if (this.state.failed) return retval;
+            LPAREN691=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_IfStatement16583); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN704_tree = this.adaptor.create(LPAREN704);
-            this.adaptor.addChild(root_0, LPAREN704_tree);
+            LPAREN691_tree = this.adaptor.create(LPAREN691);
+            this.adaptor.addChild(root_0, LPAREN691_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16537);
-            p_Expr705=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_IfStatement16585);
+            p_Expr692=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr705.getTree());
-            RPAREN706=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16540); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr692.getTree());
+            RPAREN693=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_IfStatement16588); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN706_tree = this.adaptor.create(RPAREN706);
-            this.adaptor.addChild(root_0, RPAREN706_tree);
+            RPAREN693_tree = this.adaptor.create(RPAREN693);
+            this.adaptor.addChild(root_0, RPAREN693_tree);
             }
-            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16544); if (this.state.failed) return retval;
+            k=this.match(this.input,THEN,XQueryParser.FOLLOW_THEN_in_p_IfStatement16592); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32309,13 +32353,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16548);
-            p_Hybrid707=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16596);
+            p_Hybrid694=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid707.getTree());
-            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16553); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid694.getTree());
+            k=this.match(this.input,ELSE,XQueryParser.FOLLOW_ELSE_in_p_IfStatement16601); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32323,12 +32367,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16557);
-            p_Hybrid708=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_IfStatement16605);
+            p_Hybrid695=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid708.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid695.getTree());
 
 
 
@@ -32365,7 +32409,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2075:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2077:1: p_SwitchStatement : k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchStatement"
     p_SwitchStatement: function() {
         var retval = new XQueryParser.p_SwitchStatement_return();
@@ -32374,22 +32418,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN709 = null;
-        var RPAREN711 = null;
-         var p_Expr710 = null;
-         var p_SwitchCaseStatement712 = null;
-         var p_Hybrid713 = null;
+        var LPAREN696 = null;
+        var RPAREN698 = null;
+         var p_Expr697 = null;
+         var p_SwitchCaseStatement699 = null;
+         var p_Hybrid700 = null;
 
         var k_tree=null;
-        var LPAREN709_tree=null;
-        var RPAREN711_tree=null;
+        var LPAREN696_tree=null;
+        var RPAREN698_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2076:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2076:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2078:9: (k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2078:11: k= SWITCH LPAREN p_Expr[true,true] RPAREN ( p_SwitchCaseStatement )+ k= DEFAULT k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16586); if (this.state.failed) return retval;
+            k=this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_p_SwitchStatement16634); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32397,23 +32441,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16590); if (this.state.failed) return retval;
+            LPAREN696=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_SwitchStatement16638); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN709_tree = this.adaptor.create(LPAREN709);
-            this.adaptor.addChild(root_0, LPAREN709_tree);
+            LPAREN696_tree = this.adaptor.create(LPAREN696);
+            this.adaptor.addChild(root_0, LPAREN696_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16592);
-            p_Expr710=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_SwitchStatement16640);
+            p_Expr697=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
-            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16595); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr697.getTree());
+            RPAREN698=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_SwitchStatement16643); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN711_tree = this.adaptor.create(RPAREN711);
-            this.adaptor.addChild(root_0, RPAREN711_tree);
+            RPAREN698_tree = this.adaptor.create(RPAREN698);
+            this.adaptor.addChild(root_0, RPAREN698_tree);
             }
-            // xquery/XQueryParser.g:2076:67: ( p_SwitchCaseStatement )+
+            // xquery/XQueryParser.g:2078:67: ( p_SwitchCaseStatement )+
             var cnt240=0;
             loop240:
             do {
@@ -32427,13 +32471,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt240) {
                 case 1 :
-                    // xquery/XQueryParser.g:2076:67: p_SwitchCaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597);
-                    p_SwitchCaseStatement712=this.p_SwitchCaseStatement();
+                    // xquery/XQueryParser.g:2078:67: p_SwitchCaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645);
+                    p_SwitchCaseStatement699=this.p_SwitchCaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement712.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseStatement699.getTree());
 
 
                     break;
@@ -32449,7 +32493,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt240++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16602); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_SwitchStatement16650); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32457,7 +32501,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16608); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchStatement16656); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32465,12 +32509,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16612);
-            p_Hybrid713=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchStatement16660);
+            p_Hybrid700=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid700.getTree());
 
 
 
@@ -32507,7 +32551,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2080:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2082:1: p_SwitchCaseStatement : (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_SwitchCaseStatement"
     p_SwitchCaseStatement: function() {
         var retval = new XQueryParser.p_SwitchCaseStatement_return();
@@ -32516,17 +32560,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_SwitchCaseOperand714 = null;
-         var p_Hybrid715 = null;
+         var p_SwitchCaseOperand701 = null;
+         var p_Hybrid702 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2081:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2083:9: ( (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+ k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2081:11: (k= CASE p_SwitchCaseOperand )+
+            // xquery/XQueryParser.g:2083:11: (k= CASE p_SwitchCaseOperand )+
             var cnt241=0;
             loop241:
             do {
@@ -32540,8 +32584,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt241) {
                 case 1 :
-                    // xquery/XQueryParser.g:2081:12: k= CASE p_SwitchCaseOperand
-                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16642); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2083:12: k= CASE p_SwitchCaseOperand
+                    k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_SwitchCaseStatement16690); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32549,12 +32593,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646);
-                    p_SwitchCaseOperand714=this.p_SwitchCaseOperand();
+                    this.pushFollow(XQueryParser.FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694);
+                    p_SwitchCaseOperand701=this.p_SwitchCaseOperand();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand714.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SwitchCaseOperand701.getTree());
 
 
                     break;
@@ -32570,7 +32614,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt241++;
             } while (true);
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16652); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_SwitchCaseStatement16700); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32578,12 +32622,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656);
-            p_Hybrid715=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704);
+            p_Hybrid702=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid715.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid702.getTree());
 
 
 
@@ -32620,7 +32664,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2085:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
+    // xquery/XQueryParser.g:2087:1: p_TryCatchStatement : k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ ;
     // $ANTLR start "p_TryCatchStatement"
     p_TryCatchStatement: function() {
         var retval = new XQueryParser.p_TryCatchStatement_return();
@@ -32629,18 +32673,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockStatement716 = null;
-         var p_CatchErrorList717 = null;
-         var p_BlockStatement718 = null;
+         var p_BlockStatement703 = null;
+         var p_CatchErrorList704 = null;
+         var p_BlockStatement705 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2086:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
-            // xquery/XQueryParser.g:2086:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
+            // xquery/XQueryParser.g:2088:9: (k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+ )
+            // xquery/XQueryParser.g:2088:11: k= TRY p_BlockStatement (k= CATCH p_CatchErrorList p_BlockStatement )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16685); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchStatement16733); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32648,13 +32692,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689);
-            p_BlockStatement716=this.p_BlockStatement();
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737);
+            p_BlockStatement703=this.p_BlockStatement();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement716.getTree());
-            // xquery/XQueryParser.g:2086:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement703.getTree());
+            // xquery/XQueryParser.g:2088:49: (k= CATCH p_CatchErrorList p_BlockStatement )+
             var cnt242=0;
             loop242:
             do {
@@ -32668,8 +32712,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt242) {
                 case 1 :
-                    // xquery/XQueryParser.g:2086:50: k= CATCH p_CatchErrorList p_BlockStatement
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16694); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2088:50: k= CATCH p_CatchErrorList p_BlockStatement
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchStatement16742); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32677,18 +32721,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698);
-                    p_CatchErrorList717=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746);
+                    p_CatchErrorList704=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList717.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700);
-                    p_BlockStatement718=this.p_BlockStatement();
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList704.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748);
+                    p_BlockStatement705=this.p_BlockStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement718.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockStatement705.getTree());
 
 
                     break;
@@ -32743,7 +32787,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2089:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
+    // xquery/XQueryParser.g:2091:1: p_TryCatchHybrid[strict] : k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ ;
     // $ANTLR start "p_TryCatchHybrid"
     p_TryCatchHybrid: function(strict) {
         var retval = new XQueryParser.p_TryCatchHybrid_return();
@@ -32752,18 +32796,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_BlockHybrid719 = null;
-         var p_CatchErrorList720 = null;
-         var p_BlockHybrid721 = null;
+         var p_BlockHybrid706 = null;
+         var p_CatchErrorList707 = null;
+         var p_BlockHybrid708 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2090:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
-            // xquery/XQueryParser.g:2090:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            // xquery/XQueryParser.g:2092:9: (k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+ )
+            // xquery/XQueryParser.g:2092:11: k= TRY p_BlockHybrid[$strict] (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16732); if (this.state.failed) return retval;
+            k=this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_p_TryCatchHybrid16780); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32771,13 +32815,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736);
-            p_BlockHybrid719=this.p_BlockHybrid(strict);
+            this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784);
+            p_BlockHybrid706=this.p_BlockHybrid(strict);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid719.getTree());
-            // xquery/XQueryParser.g:2090:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid706.getTree());
+            // xquery/XQueryParser.g:2092:55: (k= CATCH p_CatchErrorList p_BlockHybrid[$strict] )+
             var cnt243=0;
             loop243:
             do {
@@ -32791,8 +32835,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt243) {
                 case 1 :
-                    // xquery/XQueryParser.g:2090:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
-                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16742); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2092:56: k= CATCH p_CatchErrorList p_BlockHybrid[$strict]
+                    k=this.match(this.input,CATCH,XQueryParser.FOLLOW_CATCH_in_p_TryCatchHybrid16790); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     k_tree = this.adaptor.create(k);
                     this.adaptor.addChild(root_0, k_tree);
@@ -32800,18 +32844,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                       this.ak(k);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746);
-                    p_CatchErrorList720=this.p_CatchErrorList();
+                    this.pushFollow(XQueryParser.FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794);
+                    p_CatchErrorList707=this.p_CatchErrorList();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList720.getTree());
-                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748);
-                    p_BlockHybrid721=this.p_BlockHybrid(strict);
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CatchErrorList707.getTree());
+                    this.pushFollow(XQueryParser.FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796);
+                    p_BlockHybrid708=this.p_BlockHybrid(strict);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid721.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_BlockHybrid708.getTree());
 
 
                     break;
@@ -32866,7 +32910,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2094:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2096:1: p_TypeswitchStatement : k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_TypeswitchStatement"
     p_TypeswitchStatement: function() {
         var retval = new XQueryParser.p_TypeswitchStatement_return();
@@ -32876,24 +32920,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var LPAREN722 = null;
-        var RPAREN724 = null;
+        var LPAREN709 = null;
+        var RPAREN711 = null;
          var v = null;
-         var p_Expr723 = null;
-         var p_CaseStatement725 = null;
-         var p_Hybrid726 = null;
+         var p_Expr710 = null;
+         var p_CaseStatement712 = null;
+         var p_Hybrid713 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var LPAREN722_tree=null;
-        var RPAREN724_tree=null;
+        var LPAREN709_tree=null;
+        var RPAREN711_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2095:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2095:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2097:9: (k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2097:11: k= TYPESWITCH LPAREN p_Expr[true,true] RPAREN ( p_CaseStatement )+ k= DEFAULT (d= DOLLAR v= p_VarName )? k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781); if (this.state.failed) return retval;
+            k=this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32901,23 +32945,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN722=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16785); if (this.state.failed) return retval;
+            LPAREN709=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_TypeswitchStatement16833); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN722_tree = this.adaptor.create(LPAREN722);
-            this.adaptor.addChild(root_0, LPAREN722_tree);
+            LPAREN709_tree = this.adaptor.create(LPAREN709);
+            this.adaptor.addChild(root_0, LPAREN709_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16787);
-            p_Expr723=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_TypeswitchStatement16835);
+            p_Expr710=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr723.getTree());
-            RPAREN724=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16790); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr710.getTree());
+            RPAREN711=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_TypeswitchStatement16838); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN724_tree = this.adaptor.create(RPAREN724);
-            this.adaptor.addChild(root_0, RPAREN724_tree);
+            RPAREN711_tree = this.adaptor.create(RPAREN711);
+            this.adaptor.addChild(root_0, RPAREN711_tree);
             }
-            // xquery/XQueryParser.g:2095:71: ( p_CaseStatement )+
+            // xquery/XQueryParser.g:2097:71: ( p_CaseStatement )+
             var cnt244=0;
             loop244:
             do {
@@ -32931,13 +32975,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt244) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:71: p_CaseStatement
-                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792);
-                    p_CaseStatement725=this.p_CaseStatement();
+                    // xquery/XQueryParser.g:2097:71: p_CaseStatement
+                    this.pushFollow(XQueryParser.FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840);
+                    p_CaseStatement712=this.p_CaseStatement();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement725.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CaseStatement712.getTree());
 
 
                     break;
@@ -32953,7 +32997,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 cnt244++;
             } while (true);
 
-            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16797); if (this.state.failed) return retval;
+            k=this.match(this.input,DEFAULT,XQueryParser.FOLLOW_DEFAULT_in_p_TypeswitchStatement16845); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32961,7 +33005,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2095:113: (d= DOLLAR v= p_VarName )?
+            // xquery/XQueryParser.g:2097:113: (d= DOLLAR v= p_VarName )?
             var alt245=2;
             var LA245_0 = this.input.LA(1);
 
@@ -32970,13 +33014,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt245) {
                 case 1 :
-                    // xquery/XQueryParser.g:2095:114: d= DOLLAR v= p_VarName
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16804); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2097:114: d= DOLLAR v= p_VarName
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_TypeswitchStatement16852); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16808);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_TypeswitchStatement16856);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -32991,7 +33035,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16816); if (this.state.failed) return retval;
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_TypeswitchStatement16864); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -32999,12 +33043,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820);
-            p_Hybrid726=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868);
+            p_Hybrid713=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid726.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid713.getTree());
 
 
 
@@ -33041,7 +33085,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2099:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2101:1: p_CaseStatement : k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] ;
     // $ANTLR start "p_CaseStatement"
     p_CaseStatement: function() {
         var retval = new XQueryParser.p_CaseStatement_return();
@@ -33051,21 +33095,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var k = null;
         var d = null;
-        var AS727 = null;
+        var AS714 = null;
          var v = null;
-         var p_SequenceType728 = null;
-         var p_Hybrid729 = null;
+         var p_SequenceType715 = null;
+         var p_Hybrid716 = null;
 
         var k_tree=null;
         var d_tree=null;
-        var AS727_tree=null;
+        var AS714_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2100:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2100:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2102:9: (k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2102:11: k= CASE (d= DOLLAR v= p_VarName AS )? p_SequenceType k= RETURN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16849); if (this.state.failed) return retval;
+            k=this.match(this.input,CASE,XQueryParser.FOLLOW_CASE_in_p_CaseStatement16897); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33073,7 +33117,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            // xquery/XQueryParser.g:2100:33: (d= DOLLAR v= p_VarName AS )?
+            // xquery/XQueryParser.g:2102:33: (d= DOLLAR v= p_VarName AS )?
             var alt246=2;
             var LA246_0 = this.input.LA(1);
 
@@ -33082,13 +33126,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt246) {
                 case 1 :
-                    // xquery/XQueryParser.g:2100:34: d= DOLLAR v= p_VarName AS
-                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16856); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2102:34: d= DOLLAR v= p_VarName AS
+                    d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_CaseStatement16904); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     d_tree = this.adaptor.create(d);
                     this.adaptor.addChild(root_0, d_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16860);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_CaseStatement16908);
                     v=this.p_VarName();
 
                     this.state._fsp--;
@@ -33097,10 +33141,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(d, (v?v.stop:null)); 
                     }
-                    AS727=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16864); if (this.state.failed) return retval;
+                    AS714=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CaseStatement16912); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    AS727_tree = this.adaptor.create(AS727);
-                    this.adaptor.addChild(root_0, AS727_tree);
+                    AS714_tree = this.adaptor.create(AS714);
+                    this.adaptor.addChild(root_0, AS714_tree);
                     }
 
 
@@ -33108,13 +33152,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             }
 
-            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16868);
-            p_SequenceType728=this.p_SequenceType();
+            this.pushFollow(XQueryParser.FOLLOW_p_SequenceType_in_p_CaseStatement16916);
+            p_SequenceType715=this.p_SequenceType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType728.getTree());
-            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16872); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_SequenceType715.getTree());
+            k=this.match(this.input,RETURN,XQueryParser.FOLLOW_RETURN_in_p_CaseStatement16920); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33122,12 +33166,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16876);
-            p_Hybrid729=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_CaseStatement16924);
+            p_Hybrid716=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid716.getTree());
 
 
 
@@ -33164,7 +33208,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2104:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
+    // xquery/XQueryParser.g:2106:1: p_VarDeclStatement : ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON ;
     // $ANTLR start "p_VarDeclStatement"
     p_VarDeclStatement: function() {
         var retval = new XQueryParser.p_VarDeclStatement_return();
@@ -33175,32 +33219,32 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
         var e = null;
-        var BIND732 = null;
-        var COMMA734 = null;
-        var BIND736 = null;
-        var SEMICOLON738 = null;
+        var BIND719 = null;
+        var COMMA721 = null;
+        var BIND723 = null;
+        var SEMICOLON725 = null;
          var v = null;
          var w = null;
-         var p_Annotation730 = null;
-         var p_TypeDeclaration731 = null;
-         var p_ExprSingle733 = null;
-         var p_TypeDeclaration735 = null;
-         var p_ExprSingle737 = null;
+         var p_Annotation717 = null;
+         var p_TypeDeclaration718 = null;
+         var p_ExprSingle720 = null;
+         var p_TypeDeclaration722 = null;
+         var p_ExprSingle724 = null;
 
         var k_tree=null;
         var d_tree=null;
         var e_tree=null;
-        var BIND732_tree=null;
-        var COMMA734_tree=null;
-        var BIND736_tree=null;
-        var SEMICOLON738_tree=null;
+        var BIND719_tree=null;
+        var COMMA721_tree=null;
+        var BIND723_tree=null;
+        var SEMICOLON725_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2105:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
+            // xquery/XQueryParser.g:2107:9: ( ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON )
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )* k= VARIABLE d= DOLLAR v= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )* SEMICOLON
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2105:11: ( p_Annotation )*
+            // xquery/XQueryParser.g:2107:11: ( p_Annotation )*
             loop247:
             do {
                 var alt247=2;
@@ -33213,13 +33257,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt247) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:11: p_Annotation
-                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16903);
-                    p_Annotation730=this.p_Annotation();
+                    // xquery/XQueryParser.g:2107:11: p_Annotation
+                    this.pushFollow(XQueryParser.FOLLOW_p_Annotation_in_p_VarDeclStatement16951);
+                    p_Annotation717=this.p_Annotation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation730.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Annotation717.getTree());
 
 
                     break;
@@ -33229,7 +33273,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16908); if (this.state.failed) return retval;
+            k=this.match(this.input,VARIABLE,XQueryParser.FOLLOW_VARIABLE_in_p_VarDeclStatement16956); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33237,12 +33281,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16914); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16962); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16918);
+            this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16966);
             v=this.p_VarName();
 
             this.state._fsp--;
@@ -33251,7 +33295,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            // xquery/XQueryParser.g:2105:98: ( p_TypeDeclaration )?
+            // xquery/XQueryParser.g:2107:98: ( p_TypeDeclaration )?
             var alt248=2;
             var LA248_0 = this.input.LA(1);
 
@@ -33260,20 +33304,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt248) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:98: p_TypeDeclaration
-                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922);
-                    p_TypeDeclaration731=this.p_TypeDeclaration();
+                    // xquery/XQueryParser.g:2107:98: p_TypeDeclaration
+                    this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970);
+                    p_TypeDeclaration718=this.p_TypeDeclaration();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration731.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration718.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2105:117: ( BIND p_ExprSingle[true] )?
+            // xquery/XQueryParser.g:2107:117: ( BIND p_ExprSingle[true] )?
             var alt249=2;
             var LA249_0 = this.input.LA(1);
 
@@ -33282,25 +33326,25 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt249) {
                 case 1 :
-                    // xquery/XQueryParser.g:2105:118: BIND p_ExprSingle[true]
-                    BIND732=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16926); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2107:118: BIND p_ExprSingle[true]
+                    BIND719=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16974); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    BIND732_tree = this.adaptor.create(BIND732);
-                    this.adaptor.addChild(root_0, BIND732_tree);
+                    BIND719_tree = this.adaptor.create(BIND719);
+                    this.adaptor.addChild(root_0, BIND719_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928);
-                    p_ExprSingle733=this.p_ExprSingle(true);
+                    this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976);
+                    p_ExprSingle720=this.p_ExprSingle(true);
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle733.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle720.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2106:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
+            // xquery/XQueryParser.g:2108:11: ( COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )? )*
             loop252:
             do {
                 var alt252=2;
@@ -33313,18 +33357,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt252) {
                 case 1 :
-                    // xquery/XQueryParser.g:2106:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
-                    COMMA734=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16944); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2108:12: COMMA e= DOLLAR w= p_VarName ( p_TypeDeclaration )? ( BIND p_ExprSingle[true] )?
+                    COMMA721=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_VarDeclStatement16992); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA734_tree = this.adaptor.create(COMMA734);
-                    this.adaptor.addChild(root_0, COMMA734_tree);
+                    COMMA721_tree = this.adaptor.create(COMMA721);
+                    this.adaptor.addChild(root_0, COMMA721_tree);
                     }
-                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16948); if (this.state.failed) return retval;
+                    e=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_VarDeclStatement16996); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
                     e_tree = this.adaptor.create(e);
                     this.adaptor.addChild(root_0, e_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement16952);
+                    this.pushFollow(XQueryParser.FOLLOW_p_VarName_in_p_VarDeclStatement17000);
                     w=this.p_VarName();
 
                     this.state._fsp--;
@@ -33333,7 +33377,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     if ( this.state.backtracking===0 ) {
                        this.av(e, (w?w.stop:null)); 
                     }
-                    // xquery/XQueryParser.g:2106:65: ( p_TypeDeclaration )?
+                    // xquery/XQueryParser.g:2108:65: ( p_TypeDeclaration )?
                     var alt250=2;
                     var LA250_0 = this.input.LA(1);
 
@@ -33342,20 +33386,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt250) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:65: p_TypeDeclaration
-                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956);
-                            p_TypeDeclaration735=this.p_TypeDeclaration();
+                            // xquery/XQueryParser.g:2108:65: p_TypeDeclaration
+                            this.pushFollow(XQueryParser.FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004);
+                            p_TypeDeclaration722=this.p_TypeDeclaration();
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration735.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_TypeDeclaration722.getTree());
 
 
                             break;
 
                     }
 
-                    // xquery/XQueryParser.g:2106:84: ( BIND p_ExprSingle[true] )?
+                    // xquery/XQueryParser.g:2108:84: ( BIND p_ExprSingle[true] )?
                     var alt251=2;
                     var LA251_0 = this.input.LA(1);
 
@@ -33364,18 +33408,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     }
                     switch (alt251) {
                         case 1 :
-                            // xquery/XQueryParser.g:2106:85: BIND p_ExprSingle[true]
-                            BIND736=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement16960); if (this.state.failed) return retval;
+                            // xquery/XQueryParser.g:2108:85: BIND p_ExprSingle[true]
+                            BIND723=this.match(this.input,BIND,XQueryParser.FOLLOW_BIND_in_p_VarDeclStatement17008); if (this.state.failed) return retval;
                             if ( this.state.backtracking===0 ) {
-                            BIND736_tree = this.adaptor.create(BIND736);
-                            this.adaptor.addChild(root_0, BIND736_tree);
+                            BIND723_tree = this.adaptor.create(BIND723);
+                            this.adaptor.addChild(root_0, BIND723_tree);
                             }
-                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962);
-                            p_ExprSingle737=this.p_ExprSingle(true);
+                            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010);
+                            p_ExprSingle724=this.p_ExprSingle(true);
 
                             this.state._fsp--;
                             if (this.state.failed) return retval;
-                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle737.getTree());
+                            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle724.getTree());
 
 
                             break;
@@ -33391,10 +33435,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
             } while (true);
 
-            SEMICOLON738=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement16979); if (this.state.failed) return retval;
+            SEMICOLON725=this.match(this.input,SEMICOLON,XQueryParser.FOLLOW_SEMICOLON_in_p_VarDeclStatement17027); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            SEMICOLON738_tree = this.adaptor.create(SEMICOLON738);
-            this.adaptor.addChild(root_0, SEMICOLON738_tree);
+            SEMICOLON725_tree = this.adaptor.create(SEMICOLON725);
+            this.adaptor.addChild(root_0, SEMICOLON725_tree);
             }
 
 
@@ -33432,7 +33476,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2111:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
+    // xquery/XQueryParser.g:2113:1: p_WhileStatement : k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] ;
     // $ANTLR start "p_WhileStatement"
     p_WhileStatement: function() {
         var retval = new XQueryParser.p_WhileStatement_return();
@@ -33441,21 +33485,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var LPAREN739 = null;
-        var RPAREN741 = null;
-         var p_Expr740 = null;
-         var p_Hybrid742 = null;
+        var LPAREN726 = null;
+        var RPAREN728 = null;
+         var p_Expr727 = null;
+         var p_Hybrid729 = null;
 
         var k_tree=null;
-        var LPAREN739_tree=null;
-        var RPAREN741_tree=null;
+        var LPAREN726_tree=null;
+        var RPAREN728_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2112:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
-            // xquery/XQueryParser.g:2112:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
+            // xquery/XQueryParser.g:2114:9: (k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false] )
+            // xquery/XQueryParser.g:2114:11: k= WHILE LPAREN p_Expr[true,true] RPAREN p_Hybrid[false,false]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17007); if (this.state.failed) return retval;
+            k=this.match(this.input,WHILE,XQueryParser.FOLLOW_WHILE_in_p_WhileStatement17055); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33463,28 +33507,28 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            LPAREN739=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17011); if (this.state.failed) return retval;
+            LPAREN726=this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_p_WhileStatement17059); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LPAREN739_tree = this.adaptor.create(LPAREN739);
-            this.adaptor.addChild(root_0, LPAREN739_tree);
+            LPAREN726_tree = this.adaptor.create(LPAREN726);
+            this.adaptor.addChild(root_0, LPAREN726_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17013);
-            p_Expr740=this.p_Expr(true, true);
+            this.pushFollow(XQueryParser.FOLLOW_p_Expr_in_p_WhileStatement17061);
+            p_Expr727=this.p_Expr(true, true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr740.getTree());
-            RPAREN741=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17016); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Expr727.getTree());
+            RPAREN728=this.match(this.input,RPAREN,XQueryParser.FOLLOW_RPAREN_in_p_WhileStatement17064); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RPAREN741_tree = this.adaptor.create(RPAREN741);
-            this.adaptor.addChild(root_0, RPAREN741_tree);
+            RPAREN728_tree = this.adaptor.create(RPAREN728);
+            this.adaptor.addChild(root_0, RPAREN728_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17018);
-            p_Hybrid742=this.p_Hybrid(false, false);
+            this.pushFollow(XQueryParser.FOLLOW_p_Hybrid_in_p_WhileStatement17066);
+            p_Hybrid729=this.p_Hybrid(false, false);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid742.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_Hybrid729.getTree());
 
 
 
@@ -33521,7 +33565,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
+    // xquery/XQueryParser.g:2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );
     // $ANTLR start "p_ExprSimple"
     p_ExprSimple: function() {
         var retval = new XQueryParser.p_ExprSimple_return();
@@ -33529,56 +33573,56 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QuantifiedExpr743 = null;
-         var p_OrExpr744 = null;
-         var pg_UpdateExpr745 = null;
+         var p_QuantifiedExpr730 = null;
+         var p_OrExpr731 = null;
+         var pg_UpdateExpr732 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2117:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
+            // xquery/XQueryParser.g:2119:9: ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr )
             var alt253=3;
             alt253 = this.dfa253.predict(this.input);
             switch (alt253) {
                 case 1 :
-                    // xquery/XQueryParser.g:2117:11: p_QuantifiedExpr
+                    // xquery/XQueryParser.g:2119:11: p_QuantifiedExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045);
-                    p_QuantifiedExpr743=this.p_QuantifiedExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093);
+                    p_QuantifiedExpr730=this.p_QuantifiedExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr743.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QuantifiedExpr730.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2118:11: p_OrExpr
+                    // xquery/XQueryParser.g:2120:11: p_OrExpr
                     root_0 = this.adaptor.nil();
 
-                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17057);
-                    p_OrExpr744=this.p_OrExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_p_OrExpr_in_p_ExprSimple17105);
+                    p_OrExpr731=this.p_OrExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr744.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OrExpr731.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2119:11: {...}? => pg_UpdateExpr
+                    // xquery/XQueryParser.g:2121:11: {...}? => pg_UpdateExpr
                     root_0 = this.adaptor.nil();
 
                     if ( !((this.lc(XQU))) ) {
                         if (this.state.backtracking>0) {this.state.failed=true; return retval;}
                         throw new org.antlr.runtime.FailedPredicateException(this.input, "p_ExprSimple", "this.lc(XQU)");
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072);
-                    pg_UpdateExpr745=this.pg_UpdateExpr();
+                    this.pushFollow(XQueryParser.FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120);
+                    pg_UpdateExpr732=this.pg_UpdateExpr();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr745.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, pg_UpdateExpr732.getTree());
 
 
                     break;
@@ -33617,7 +33661,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2123:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
+    // xquery/XQueryParser.g:2125:1: p_BlockExpr : LBRACKET p_StatementsAndExpr RBRACKET ;
     // $ANTLR start "p_BlockExpr"
     p_BlockExpr: function() {
         var retval = new XQueryParser.p_BlockExpr_return();
@@ -33625,33 +33669,33 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-        var LBRACKET746 = null;
-        var RBRACKET748 = null;
-         var p_StatementsAndExpr747 = null;
+        var LBRACKET733 = null;
+        var RBRACKET735 = null;
+         var p_StatementsAndExpr734 = null;
 
-        var LBRACKET746_tree=null;
-        var RBRACKET748_tree=null;
+        var LBRACKET733_tree=null;
+        var RBRACKET735_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2124:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
-            // xquery/XQueryParser.g:2124:11: LBRACKET p_StatementsAndExpr RBRACKET
+            // xquery/XQueryParser.g:2126:9: ( LBRACKET p_StatementsAndExpr RBRACKET )
+            // xquery/XQueryParser.g:2126:11: LBRACKET p_StatementsAndExpr RBRACKET
             root_0 = this.adaptor.nil();
 
-            LBRACKET746=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17098); if (this.state.failed) return retval;
+            LBRACKET733=this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_p_BlockExpr17146); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            LBRACKET746_tree = this.adaptor.create(LBRACKET746);
-            this.adaptor.addChild(root_0, LBRACKET746_tree);
+            LBRACKET733_tree = this.adaptor.create(LBRACKET733);
+            this.adaptor.addChild(root_0, LBRACKET733_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100);
-            p_StatementsAndExpr747=this.p_StatementsAndExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148);
+            p_StatementsAndExpr734=this.p_StatementsAndExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr747.getTree());
-            RBRACKET748=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17102); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StatementsAndExpr734.getTree());
+            RBRACKET735=this.match(this.input,RBRACKET,XQueryParser.FOLLOW_RBRACKET_in_p_BlockExpr17150); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
-            RBRACKET748_tree = this.adaptor.create(RBRACKET748);
-            this.adaptor.addChild(root_0, RBRACKET748_tree);
+            RBRACKET735_tree = this.adaptor.create(RBRACKET735);
+            this.adaptor.addChild(root_0, RBRACKET735_tree);
             }
 
 
@@ -33689,7 +33733,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2131:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
+    // xquery/XQueryParser.g:2133:1: p_CollectionDecl : k= COLLECTION p_QName ( p_CollectionTypeDecl )? ;
     // $ANTLR start "p_CollectionDecl"
     p_CollectionDecl: function() {
         var retval = new XQueryParser.p_CollectionDecl_return();
@@ -33698,17 +33742,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName749 = null;
-         var p_CollectionTypeDecl750 = null;
+         var p_QName736 = null;
+         var p_CollectionTypeDecl737 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2132:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
-            // xquery/XQueryParser.g:2132:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
+            // xquery/XQueryParser.g:2134:9: (k= COLLECTION p_QName ( p_CollectionTypeDecl )? )
+            // xquery/XQueryParser.g:2134:11: k= COLLECTION p_QName ( p_CollectionTypeDecl )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17133); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_CollectionDecl17181); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33716,13 +33760,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17137);
-            p_QName749=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_CollectionDecl17185);
+            p_QName736=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName749.getTree());
-            // xquery/XQueryParser.g:2132:47: ( p_CollectionTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName736.getTree());
+            // xquery/XQueryParser.g:2134:47: ( p_CollectionTypeDecl )?
             var alt254=2;
             var LA254_0 = this.input.LA(1);
 
@@ -33731,13 +33775,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt254) {
                 case 1 :
-                    // xquery/XQueryParser.g:2132:47: p_CollectionTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139);
-                    p_CollectionTypeDecl750=this.p_CollectionTypeDecl();
+                    // xquery/XQueryParser.g:2134:47: p_CollectionTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187);
+                    p_CollectionTypeDecl737=this.p_CollectionTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl750.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_CollectionTypeDecl737.getTree());
 
 
                     break;
@@ -33780,7 +33824,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2135:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
+    // xquery/XQueryParser.g:2137:1: p_CollectionTypeDecl : (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) ;
     // $ANTLR start "p_CollectionTypeDecl"
     p_CollectionTypeDecl: function() {
         var retval = new XQueryParser.p_CollectionTypeDecl_return();
@@ -33789,19 +33833,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_KindTest751 = null;
-         var p_OccurrenceIndicator752 = null;
+         var p_KindTest738 = null;
+         var p_OccurrenceIndicator739 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2136:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:9: ( (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? ) )
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
             root_0 = this.adaptor.nil();
 
-            // xquery/XQueryParser.g:2136:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2136:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17168); if (this.state.failed) return retval;
+            // xquery/XQueryParser.g:2138:11: (k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2138:12: k= AS p_KindTest ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_CollectionTypeDecl17216); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33809,13 +33853,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172);
-            p_KindTest751=this.p_KindTest();
+            this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220);
+            p_KindTest738=this.p_KindTest();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest751.getTree());
-            // xquery/XQueryParser.g:2136:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_KindTest738.getTree());
+            // xquery/XQueryParser.g:2138:43: ( ( p_OccurrenceIndicator )=> p_OccurrenceIndicator )?
             var alt255=2;
             var LA255_0 = this.input.LA(1);
 
@@ -33824,13 +33868,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt255) {
                 case 1 :
-                    // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181);
-                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )=> p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229);
+                    p_OccurrenceIndicator739=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator739.getTree());
 
 
                     break;
@@ -33876,7 +33920,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2139:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
+    // xquery/XQueryParser.g:2141:1: p_IndexDecl : k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* ;
     // $ANTLR start "p_IndexDecl"
     p_IndexDecl: function() {
         var retval = new XQueryParser.p_IndexDecl_return();
@@ -33885,21 +33929,21 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-        var COMMA756 = null;
-         var p_IndexName753 = null;
-         var p_IndexDomainExpr754 = null;
-         var p_IndexKeySpec755 = null;
-         var p_IndexKeySpec757 = null;
+        var COMMA743 = null;
+         var p_IndexName740 = null;
+         var p_IndexDomainExpr741 = null;
+         var p_IndexKeySpec742 = null;
+         var p_IndexKeySpec744 = null;
 
         var k_tree=null;
-        var COMMA756_tree=null;
+        var COMMA743_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2140:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
-            // xquery/XQueryParser.g:2140:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
+            // xquery/XQueryParser.g:2142:9: (k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )* )
+            // xquery/XQueryParser.g:2142:11: k= INDEX p_IndexName k= ON k= NODES p_IndexDomainExpr k= BY p_IndexKeySpec ( COMMA p_IndexKeySpec )*
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17211); if (this.state.failed) return retval;
+            k=this.match(this.input,INDEX,XQueryParser.FOLLOW_INDEX_in_p_IndexDecl17259); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33907,13 +33951,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17215);
-            p_IndexName753=this.p_IndexName();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexName_in_p_IndexDecl17263);
+            p_IndexName740=this.p_IndexName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName753.getTree());
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17219); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexName740.getTree());
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_IndexDecl17267); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33921,7 +33965,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17225); if (this.state.failed) return retval;
+            k=this.match(this.input,NODES,XQueryParser.FOLLOW_NODES_in_p_IndexDecl17273); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33929,13 +33973,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229);
-            p_IndexDomainExpr754=this.p_IndexDomainExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277);
+            p_IndexDomainExpr741=this.p_IndexDomainExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr754.getTree());
-            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17233); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexDomainExpr741.getTree());
+            k=this.match(this.input,BY,XQueryParser.FOLLOW_BY_in_p_IndexDecl17281); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -33943,13 +33987,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237);
-            p_IndexKeySpec755=this.p_IndexKeySpec();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285);
+            p_IndexKeySpec742=this.p_IndexKeySpec();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec755.getTree());
-            // xquery/XQueryParser.g:2140:142: ( COMMA p_IndexKeySpec )*
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec742.getTree());
+            // xquery/XQueryParser.g:2142:142: ( COMMA p_IndexKeySpec )*
             loop256:
             do {
                 var alt256=2;
@@ -33962,18 +34006,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 switch (alt256) {
                 case 1 :
-                    // xquery/XQueryParser.g:2140:143: COMMA p_IndexKeySpec
-                    COMMA756=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17240); if (this.state.failed) return retval;
+                    // xquery/XQueryParser.g:2142:143: COMMA p_IndexKeySpec
+                    COMMA743=this.match(this.input,COMMA,XQueryParser.FOLLOW_COMMA_in_p_IndexDecl17288); if (this.state.failed) return retval;
                     if ( this.state.backtracking===0 ) {
-                    COMMA756_tree = this.adaptor.create(COMMA756);
-                    this.adaptor.addChild(root_0, COMMA756_tree);
+                    COMMA743_tree = this.adaptor.create(COMMA743);
+                    this.adaptor.addChild(root_0, COMMA743_tree);
                     }
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242);
-                    p_IndexKeySpec757=this.p_IndexKeySpec();
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290);
+                    p_IndexKeySpec744=this.p_IndexKeySpec();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec757.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeySpec744.getTree());
 
 
                     break;
@@ -34019,7 +34063,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2143:1: p_IndexName : p_QName ;
+    // xquery/XQueryParser.g:2145:1: p_IndexName : p_QName ;
     // $ANTLR start "p_IndexName"
     p_IndexName: function() {
         var retval = new XQueryParser.p_IndexName_return();
@@ -34027,20 +34071,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName758 = null;
+         var p_QName745 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2144:9: ( p_QName )
-            // xquery/XQueryParser.g:2144:11: p_QName
+            // xquery/XQueryParser.g:2146:9: ( p_QName )
+            // xquery/XQueryParser.g:2146:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17269);
-            p_QName758=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_IndexName17317);
+            p_QName745=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName745.getTree());
 
 
 
@@ -34077,7 +34121,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2147:1: p_IndexDomainExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2149:1: p_IndexDomainExpr : p_PathExpr ;
     // $ANTLR start "p_IndexDomainExpr"
     p_IndexDomainExpr: function() {
         var retval = new XQueryParser.p_IndexDomainExpr_return();
@@ -34085,20 +34129,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr759 = null;
+         var p_PathExpr746 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2148:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2148:11: p_PathExpr
+            // xquery/XQueryParser.g:2150:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2150:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294);
-            p_PathExpr759=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342);
+            p_PathExpr746=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr759.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr746.getTree());
 
 
 
@@ -34135,7 +34179,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2151:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
+    // xquery/XQueryParser.g:2153:1: p_IndexKeySpec : p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? ;
     // $ANTLR start "p_IndexKeySpec"
     p_IndexKeySpec: function() {
         var retval = new XQueryParser.p_IndexKeySpec_return();
@@ -34143,23 +34187,23 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_IndexKeyExpr760 = null;
-         var p_IndexKeyTypeDecl761 = null;
-         var p_IndexKeyCollation762 = null;
+         var p_IndexKeyExpr747 = null;
+         var p_IndexKeyTypeDecl748 = null;
+         var p_IndexKeyCollation749 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2152:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
-            // xquery/XQueryParser.g:2152:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:9: ( p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )? )
+            // xquery/XQueryParser.g:2154:11: p_IndexKeyExpr ( p_IndexKeyTypeDecl )? ( p_IndexKeyCollation )?
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319);
-            p_IndexKeyExpr760=this.p_IndexKeyExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367);
+            p_IndexKeyExpr747=this.p_IndexKeyExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr760.getTree());
-            // xquery/XQueryParser.g:2152:26: ( p_IndexKeyTypeDecl )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyExpr747.getTree());
+            // xquery/XQueryParser.g:2154:26: ( p_IndexKeyTypeDecl )?
             var alt257=2;
             var LA257_0 = this.input.LA(1);
 
@@ -34168,20 +34212,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt257) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:26: p_IndexKeyTypeDecl
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321);
-                    p_IndexKeyTypeDecl761=this.p_IndexKeyTypeDecl();
+                    // xquery/XQueryParser.g:2154:26: p_IndexKeyTypeDecl
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369);
+                    p_IndexKeyTypeDecl748=this.p_IndexKeyTypeDecl();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl761.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyTypeDecl748.getTree());
 
 
                     break;
 
             }
 
-            // xquery/XQueryParser.g:2152:46: ( p_IndexKeyCollation )?
+            // xquery/XQueryParser.g:2154:46: ( p_IndexKeyCollation )?
             var alt258=2;
             var LA258_0 = this.input.LA(1);
 
@@ -34190,13 +34234,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt258) {
                 case 1 :
-                    // xquery/XQueryParser.g:2152:46: p_IndexKeyCollation
-                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324);
-                    p_IndexKeyCollation762=this.p_IndexKeyCollation();
+                    // xquery/XQueryParser.g:2154:46: p_IndexKeyCollation
+                    this.pushFollow(XQueryParser.FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372);
+                    p_IndexKeyCollation749=this.p_IndexKeyCollation();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation762.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_IndexKeyCollation749.getTree());
 
 
                     break;
@@ -34239,7 +34283,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2155:1: p_IndexKeyExpr : p_PathExpr ;
+    // xquery/XQueryParser.g:2157:1: p_IndexKeyExpr : p_PathExpr ;
     // $ANTLR start "p_IndexKeyExpr"
     p_IndexKeyExpr: function() {
         var retval = new XQueryParser.p_IndexKeyExpr_return();
@@ -34247,20 +34291,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_PathExpr763 = null;
+         var p_PathExpr750 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2156:9: ( p_PathExpr )
-            // xquery/XQueryParser.g:2156:11: p_PathExpr
+            // xquery/XQueryParser.g:2158:9: ( p_PathExpr )
+            // xquery/XQueryParser.g:2158:11: p_PathExpr
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350);
-            p_PathExpr763=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398);
+            p_PathExpr750=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr750.getTree());
 
 
 
@@ -34297,7 +34341,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2159:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
+    // xquery/XQueryParser.g:2161:1: p_IndexKeyTypeDecl : k= AS p_AtomicType ( p_OccurrenceIndicator )? ;
     // $ANTLR start "p_IndexKeyTypeDecl"
     p_IndexKeyTypeDecl: function() {
         var retval = new XQueryParser.p_IndexKeyTypeDecl_return();
@@ -34306,17 +34350,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_AtomicType764 = null;
-         var p_OccurrenceIndicator765 = null;
+         var p_AtomicType751 = null;
+         var p_OccurrenceIndicator752 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2160:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
-            // xquery/XQueryParser.g:2160:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
+            // xquery/XQueryParser.g:2162:9: (k= AS p_AtomicType ( p_OccurrenceIndicator )? )
+            // xquery/XQueryParser.g:2162:11: k= AS p_AtomicType ( p_OccurrenceIndicator )?
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17377); if (this.state.failed) return retval;
+            k=this.match(this.input,AS,XQueryParser.FOLLOW_AS_in_p_IndexKeyTypeDecl17425); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34324,13 +34368,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381);
-            p_AtomicType764=this.p_AtomicType();
+            this.pushFollow(XQueryParser.FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429);
+            p_AtomicType751=this.p_AtomicType();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType764.getTree());
-            // xquery/XQueryParser.g:2160:44: ( p_OccurrenceIndicator )?
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_AtomicType751.getTree());
+            // xquery/XQueryParser.g:2162:44: ( p_OccurrenceIndicator )?
             var alt259=2;
             var LA259_0 = this.input.LA(1);
 
@@ -34339,13 +34383,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt259) {
                 case 1 :
-                    // xquery/XQueryParser.g:2160:44: p_OccurrenceIndicator
-                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383);
-                    p_OccurrenceIndicator765=this.p_OccurrenceIndicator();
+                    // xquery/XQueryParser.g:2162:44: p_OccurrenceIndicator
+                    this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431);
+                    p_OccurrenceIndicator752=this.p_OccurrenceIndicator();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator765.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_OccurrenceIndicator752.getTree());
 
 
                     break;
@@ -34388,7 +34432,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2163:1: p_AtomicType : p_QName ;
+    // xquery/XQueryParser.g:2165:1: p_AtomicType : p_QName ;
     // $ANTLR start "p_AtomicType"
     p_AtomicType: function() {
         var retval = new XQueryParser.p_AtomicType_return();
@@ -34396,20 +34440,20 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         var root_0 = null;
 
-         var p_QName766 = null;
+         var p_QName753 = null;
 
 
         try {
-            // xquery/XQueryParser.g:2164:9: ( p_QName )
-            // xquery/XQueryParser.g:2164:11: p_QName
+            // xquery/XQueryParser.g:2166:9: ( p_QName )
+            // xquery/XQueryParser.g:2166:11: p_QName
             root_0 = this.adaptor.nil();
 
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17409);
-            p_QName766=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_AtomicType17457);
+            p_QName753=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName766.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName753.getTree());
 
 
 
@@ -34446,7 +34490,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2167:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
+    // xquery/XQueryParser.g:2169:1: p_IndexKeyCollation : k= COLLATION p_StringLiteral ;
     // $ANTLR start "p_IndexKeyCollation"
     p_IndexKeyCollation: function() {
         var retval = new XQueryParser.p_IndexKeyCollation_return();
@@ -34455,16 +34499,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_StringLiteral767 = null;
+         var p_StringLiteral754 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2168:9: (k= COLLATION p_StringLiteral )
-            // xquery/XQueryParser.g:2168:11: k= COLLATION p_StringLiteral
+            // xquery/XQueryParser.g:2170:9: (k= COLLATION p_StringLiteral )
+            // xquery/XQueryParser.g:2170:11: k= COLLATION p_StringLiteral
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17436); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLATION,XQueryParser.FOLLOW_COLLATION_in_p_IndexKeyCollation17484); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34472,12 +34516,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440);
-            p_StringLiteral767=this.p_StringLiteral();
+            this.pushFollow(XQueryParser.FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488);
+            p_StringLiteral754=this.p_StringLiteral();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral767.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_StringLiteral754.getTree());
 
 
 
@@ -34514,7 +34558,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2171:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
+    // xquery/XQueryParser.g:2173:1: p_ICDecl : k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) ;
     // $ANTLR start "p_ICDecl"
     p_ICDecl: function() {
         var retval = new XQueryParser.p_ICDecl_return();
@@ -34523,18 +34567,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName768 = null;
-         var p_ICCollection769 = null;
-         var p_ICForeignKey770 = null;
+         var p_QName755 = null;
+         var p_ICCollection756 = null;
+         var p_ICForeignKey757 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2172:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
-            // xquery/XQueryParser.g:2172:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
+            // xquery/XQueryParser.g:2174:9: (k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey ) )
+            // xquery/XQueryParser.g:2174:11: k= INTEGRITY k= CONSTRAINT p_QName ( p_ICCollection | p_ICForeignKey )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17467); if (this.state.failed) return retval;
+            k=this.match(this.input,INTEGRITY,XQueryParser.FOLLOW_INTEGRITY_in_p_ICDecl17515); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34542,7 +34586,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17473); if (this.state.failed) return retval;
+            k=this.match(this.input,CONSTRAINT,XQueryParser.FOLLOW_CONSTRAINT_in_p_ICDecl17521); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34550,13 +34594,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17477);
-            p_QName768=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICDecl17525);
+            p_QName755=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName768.getTree());
-            // xquery/XQueryParser.g:2172:74: ( p_ICCollection | p_ICForeignKey )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName755.getTree());
+            // xquery/XQueryParser.g:2174:74: ( p_ICCollection | p_ICForeignKey )
             var alt260=2;
             var LA260_0 = this.input.LA(1);
 
@@ -34575,24 +34619,24 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             }
             switch (alt260) {
                 case 1 :
-                    // xquery/XQueryParser.g:2172:75: p_ICCollection
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17480);
-                    p_ICCollection769=this.p_ICCollection();
+                    // xquery/XQueryParser.g:2174:75: p_ICCollection
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollection_in_p_ICDecl17528);
+                    p_ICCollection756=this.p_ICCollection();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection769.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollection756.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2172:92: p_ICForeignKey
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17484);
-                    p_ICForeignKey770=this.p_ICForeignKey();
+                    // xquery/XQueryParser.g:2174:92: p_ICForeignKey
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKey_in_p_ICDecl17532);
+                    p_ICForeignKey757=this.p_ICForeignKey();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey770.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKey757.getTree());
 
 
                     break;
@@ -34635,7 +34679,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2175:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
+    // xquery/XQueryParser.g:2177:1: p_ICCollection : k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) ;
     // $ANTLR start "p_ICCollection"
     p_ICCollection: function() {
         var retval = new XQueryParser.p_ICCollection_return();
@@ -34644,19 +34688,19 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_QName771 = null;
-         var p_ICCollSequence772 = null;
-         var p_ICCollSequenceUnique773 = null;
-         var p_ICCollNode774 = null;
+         var p_QName758 = null;
+         var p_ICCollSequence759 = null;
+         var p_ICCollSequenceUnique760 = null;
+         var p_ICCollNode761 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2176:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
-            // xquery/XQueryParser.g:2176:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            // xquery/XQueryParser.g:2178:9: (k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode ) )
+            // xquery/XQueryParser.g:2178:11: k= ON k= COLLECTION p_QName ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17512); if (this.state.failed) return retval;
+            k=this.match(this.input,ON,XQueryParser.FOLLOW_ON_in_p_ICCollection17560); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34664,7 +34708,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17518); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICCollection17566); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34672,13 +34716,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17522);
-            p_QName771=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollection17570);
+            p_QName758=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName771.getTree());
-            // xquery/XQueryParser.g:2176:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName758.getTree());
+            // xquery/XQueryParser.g:2178:67: ( p_ICCollSequence | p_ICCollSequenceUnique | p_ICCollNode )
             var alt261=3;
             switch ( this.input.LA(1) ) {
             case DOLLAR:
@@ -34700,35 +34744,35 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
             switch (alt261) {
                 case 1 :
-                    // xquery/XQueryParser.g:2176:68: p_ICCollSequence
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17525);
-                    p_ICCollSequence772=this.p_ICCollSequence();
+                    // xquery/XQueryParser.g:2178:68: p_ICCollSequence
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequence_in_p_ICCollection17573);
+                    p_ICCollSequence759=this.p_ICCollSequence();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence772.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequence759.getTree());
 
 
                     break;
                 case 2 :
-                    // xquery/XQueryParser.g:2176:87: p_ICCollSequenceUnique
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529);
-                    p_ICCollSequenceUnique773=this.p_ICCollSequenceUnique();
+                    // xquery/XQueryParser.g:2178:87: p_ICCollSequenceUnique
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577);
+                    p_ICCollSequenceUnique760=this.p_ICCollSequenceUnique();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique773.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollSequenceUnique760.getTree());
 
 
                     break;
                 case 3 :
-                    // xquery/XQueryParser.g:2176:112: p_ICCollNode
-                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17533);
-                    p_ICCollNode774=this.p_ICCollNode();
+                    // xquery/XQueryParser.g:2178:112: p_ICCollNode
+                    this.pushFollow(XQueryParser.FOLLOW_p_ICCollNode_in_p_ICCollection17581);
+                    p_ICCollNode761=this.p_ICCollNode();
 
                     this.state._fsp--;
                     if (this.state.failed) return retval;
-                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode774.getTree());
+                    if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICCollNode761.getTree());
 
 
                     break;
@@ -34771,7 +34815,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2179:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2181:1: p_ICCollSequence : d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollSequence"
     p_ICCollSequence: function() {
         var retval = new XQueryParser.p_ICCollSequence_return();
@@ -34782,22 +34826,22 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var d = null;
         var k = null;
          var v = null;
-         var p_ExprSingle775 = null;
+         var p_ExprSingle762 = null;
 
         var d_tree=null;
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2180:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2180:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2182:9: (d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2182:11: d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17561); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequence17609); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17565);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequence17613);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -34806,7 +34850,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17571); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequence17619); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34814,12 +34858,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17575);
-            p_ExprSingle775=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollSequence17623);
+            p_ExprSingle762=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle775.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle762.getTree());
 
 
 
@@ -34856,7 +34900,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2183:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2185:1: p_ICCollSequenceUnique : k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr ;
     // $ANTLR start "p_ICCollSequenceUnique"
     p_ICCollSequenceUnique: function() {
         var retval = new XQueryParser.p_ICCollSequenceUnique_return();
@@ -34867,17 +34911,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_PathExpr776 = null;
+         var p_PathExpr763 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2184:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2184:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2186:9: (k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2186:11: k= NODE d= DOLLAR v= p_QName k= CHECK k= UNIQUE k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17603); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollSequenceUnique17651); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34885,12 +34929,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17613);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollSequenceUnique17661);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -34899,7 +34943,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17619); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollSequenceUnique17667); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34907,7 +34951,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625); if (this.state.failed) return retval;
+            k=this.match(this.input,UNIQUE,XQueryParser.FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34915,7 +34959,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17631); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICCollSequenceUnique17679); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34923,12 +34967,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635);
-            p_PathExpr776=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683);
+            p_PathExpr763=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr776.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr763.getTree());
 
 
 
@@ -34965,7 +35009,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2187:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
+    // xquery/XQueryParser.g:2189:1: p_ICCollNode : k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] ;
     // $ANTLR start "p_ICCollNode"
     p_ICCollNode: function() {
         var retval = new XQueryParser.p_ICCollNode_return();
@@ -34976,17 +35020,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_ExprSingle777 = null;
+         var p_ExprSingle764 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2188:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
-            // xquery/XQueryParser.g:2188:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
+            // xquery/XQueryParser.g:2190:9: (k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true] )
+            // xquery/XQueryParser.g:2190:11: k= FOREACH k= NODE d= DOLLAR v= p_QName k= CHECK p_ExprSingle[true]
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17662); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREACH,XQueryParser.FOLLOW_FOREACH_in_p_ICCollNode17710); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -34994,7 +35038,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17668); if (this.state.failed) return retval;
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICCollNode17716); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35002,12 +35046,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17674); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICCollNode17722); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17678);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICCollNode17726);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -35016,7 +35060,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17684); if (this.state.failed) return retval;
+            k=this.match(this.input,CHECK,XQueryParser.FOLLOW_CHECK_in_p_ICCollNode17732); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35024,12 +35068,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17688);
-            p_ExprSingle777=this.p_ExprSingle(true);
+            this.pushFollow(XQueryParser.FOLLOW_p_ExprSingle_in_p_ICCollNode17736);
+            p_ExprSingle764=this.p_ExprSingle(true);
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle777.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ExprSingle764.getTree());
 
 
 
@@ -35066,7 +35110,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2191:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
+    // xquery/XQueryParser.g:2193:1: p_ICForeignKey : k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget ;
     // $ANTLR start "p_ICForeignKey"
     p_ICForeignKey: function() {
         var retval = new XQueryParser.p_ICForeignKey_return();
@@ -35075,17 +35119,17 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeySource778 = null;
-         var p_ICForeignKeyTarget779 = null;
+         var p_ICForeignKeySource765 = null;
+         var p_ICForeignKeyTarget766 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2192:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
-            // xquery/XQueryParser.g:2192:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
+            // xquery/XQueryParser.g:2194:9: (k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget )
+            // xquery/XQueryParser.g:2194:11: k= FOREIGN k= KEY p_ICForeignKeySource p_ICForeignKeyTarget
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17716); if (this.state.failed) return retval;
+            k=this.match(this.input,FOREIGN,XQueryParser.FOLLOW_FOREIGN_in_p_ICForeignKey17764); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35093,7 +35137,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17722); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKey17770); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35101,18 +35145,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726);
-            p_ICForeignKeySource778=this.p_ICForeignKeySource();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774);
+            p_ICForeignKeySource765=this.p_ICForeignKeySource();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource778.getTree());
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728);
-            p_ICForeignKeyTarget779=this.p_ICForeignKeyTarget();
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeySource765.getTree());
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776);
+            p_ICForeignKeyTarget766=this.p_ICForeignKeyTarget();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget779.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyTarget766.getTree());
 
 
 
@@ -35149,7 +35193,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2195:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2197:1: p_ICForeignKeySource : k= FROM p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeySource"
     p_ICForeignKeySource: function() {
         var retval = new XQueryParser.p_ICForeignKeySource_return();
@@ -35158,16 +35202,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues780 = null;
+         var p_ICForeignKeyValues767 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2196:9: (k= FROM p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2196:11: k= FROM p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2198:9: (k= FROM p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2198:11: k= FROM p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17755); if (this.state.failed) return retval;
+            k=this.match(this.input,FROM,XQueryParser.FOLLOW_FROM_in_p_ICForeignKeySource17803); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35175,12 +35219,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759);
-            p_ICForeignKeyValues780=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807);
+            p_ICForeignKeyValues767=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues780.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues767.getTree());
 
 
 
@@ -35217,7 +35261,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2199:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
+    // xquery/XQueryParser.g:2201:1: p_ICForeignKeyTarget : k= TO p_ICForeignKeyValues ;
     // $ANTLR start "p_ICForeignKeyTarget"
     p_ICForeignKeyTarget: function() {
         var retval = new XQueryParser.p_ICForeignKeyTarget_return();
@@ -35226,16 +35270,16 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var root_0 = null;
 
         var k = null;
-         var p_ICForeignKeyValues781 = null;
+         var p_ICForeignKeyValues768 = null;
 
         var k_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2200:9: (k= TO p_ICForeignKeyValues )
-            // xquery/XQueryParser.g:2200:11: k= TO p_ICForeignKeyValues
+            // xquery/XQueryParser.g:2202:9: (k= TO p_ICForeignKeyValues )
+            // xquery/XQueryParser.g:2202:11: k= TO p_ICForeignKeyValues
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17786); if (this.state.failed) return retval;
+            k=this.match(this.input,TO,XQueryParser.FOLLOW_TO_in_p_ICForeignKeyTarget17834); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35243,12 +35287,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790);
-            p_ICForeignKeyValues781=this.p_ICForeignKeyValues();
+            this.pushFollow(XQueryParser.FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838);
+            p_ICForeignKeyValues768=this.p_ICForeignKeyValues();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues781.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_ICForeignKeyValues768.getTree());
 
 
 
@@ -35285,7 +35329,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         return;
     })(),
 
-    // xquery/XQueryParser.g:2203:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
+    // xquery/XQueryParser.g:2205:1: p_ICForeignKeyValues : k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr ;
     // $ANTLR start "p_ICForeignKeyValues"
     p_ICForeignKeyValues: function() {
         var retval = new XQueryParser.p_ICForeignKeyValues_return();
@@ -35296,18 +35340,18 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         var k = null;
         var d = null;
          var v = null;
-         var p_QName782 = null;
-         var p_PathExpr783 = null;
+         var p_QName769 = null;
+         var p_PathExpr770 = null;
 
         var k_tree=null;
         var d_tree=null;
 
         try {
-            // xquery/XQueryParser.g:2204:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
-            // xquery/XQueryParser.g:2204:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
+            // xquery/XQueryParser.g:2206:9: (k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr )
+            // xquery/XQueryParser.g:2206:11: k= COLLECTION p_QName k= NODE d= DOLLAR v= p_QName k= KEY p_PathExpr
             root_0 = this.adaptor.nil();
 
-            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817); if (this.state.failed) return retval;
+            k=this.match(this.input,COLLECTION,XQueryParser.FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35315,13 +35359,13 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17821);
-            p_QName782=this.p_QName();
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17869);
+            p_QName769=this.p_QName();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName782.getTree());
-            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17825); if (this.state.failed) return retval;
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_QName769.getTree());
+            k=this.match(this.input,NODE,XQueryParser.FOLLOW_NODE_in_p_ICForeignKeyValues17873); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35329,12 +35373,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831); if (this.state.failed) return retval;
+            d=this.match(this.input,DOLLAR,XQueryParser.FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             d_tree = this.adaptor.create(d);
             this.adaptor.addChild(root_0, d_tree);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17835);
+            this.pushFollow(XQueryParser.FOLLOW_p_QName_in_p_ICForeignKeyValues17883);
             v=this.p_QName();
 
             this.state._fsp--;
@@ -35343,7 +35387,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
                this.av(d, (v?v.stop:null)); 
             }
-            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17841); if (this.state.failed) return retval;
+            k=this.match(this.input,KEY,XQueryParser.FOLLOW_KEY_in_p_ICForeignKeyValues17889); if (this.state.failed) return retval;
             if ( this.state.backtracking===0 ) {
             k_tree = this.adaptor.create(k);
             this.adaptor.addChild(root_0, k_tree);
@@ -35351,12 +35395,12 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
             if ( this.state.backtracking===0 ) {
               this.ak(k);
             }
-            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845);
-            p_PathExpr783=this.p_PathExpr();
+            this.pushFollow(XQueryParser.FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893);
+            p_PathExpr770=this.p_PathExpr();
 
             this.state._fsp--;
             if (this.state.failed) return retval;
-            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr783.getTree());
+            if ( this.state.backtracking===0 ) this.adaptor.addChild(root_0, p_PathExpr770.getTree());
 
 
 
@@ -35384,7 +35428,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred1_XQueryParser"
     synpred1_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:572:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
+        // xquery/XQueryParser.g:574:11: ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )
         var alt262=2;
         var LA262_0 = this.input.LA(1);
 
@@ -35417,9 +35461,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt262) {
             case 1 :
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:12: ( ( FOR | LET ) DOLLAR )
-                // xquery/XQueryParser.g:572:13: ( FOR | LET ) DOLLAR
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:12: ( ( FOR | LET ) DOLLAR )
+                // xquery/XQueryParser.g:574:13: ( FOR | LET ) DOLLAR
                 if ( this.input.LA(1)==FOR||this.input.LA(1)==LET ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -35438,9 +35482,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:35: ( FOR ( TUMBLING | SLIDING ) )
-                // xquery/XQueryParser.g:572:36: FOR ( TUMBLING | SLIDING )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:35: ( FOR ( TUMBLING | SLIDING ) )
+                // xquery/XQueryParser.g:574:36: FOR ( TUMBLING | SLIDING )
                 this.match(this.input,FOR,XQueryParser.FOLLOW_FOR_in_synpred1_XQueryParser3549); if (this.state.failed) return ;
                 if ( this.input.LA(1)==SLIDING||this.input.LA(1)==TUMBLING ) {
                     this.input.consume();
@@ -35464,8 +35508,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred2_XQueryParser"
     synpred2_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:573:11: ( IF LPAREN )
-        // xquery/XQueryParser.g:573:12: IF LPAREN
+        // xquery/XQueryParser.g:575:11: ( IF LPAREN )
+        // xquery/XQueryParser.g:575:12: IF LPAREN
         this.match(this.input,IF,XQueryParser.FOLLOW_IF_in_synpred2_XQueryParser3577); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred2_XQueryParser3579); if (this.state.failed) return ;
 
@@ -35475,8 +35519,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred3_XQueryParser"
     synpred3_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:574:11: ( SWITCH LPAREN )
-        // xquery/XQueryParser.g:574:12: SWITCH LPAREN
+        // xquery/XQueryParser.g:576:11: ( SWITCH LPAREN )
+        // xquery/XQueryParser.g:576:12: SWITCH LPAREN
         this.match(this.input,SWITCH,XQueryParser.FOLLOW_SWITCH_in_synpred3_XQueryParser3607); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred3_XQueryParser3609); if (this.state.failed) return ;
 
@@ -35486,8 +35530,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred4_XQueryParser"
     synpred4_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:575:11: ( TYPESWITCH LPAREN )
-        // xquery/XQueryParser.g:575:12: TYPESWITCH LPAREN
+        // xquery/XQueryParser.g:577:11: ( TYPESWITCH LPAREN )
+        // xquery/XQueryParser.g:577:12: TYPESWITCH LPAREN
         this.match(this.input,TYPESWITCH,XQueryParser.FOLLOW_TYPESWITCH_in_synpred4_XQueryParser3633); if (this.state.failed) return ;
         this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred4_XQueryParser3635); if (this.state.failed) return ;
 
@@ -35497,8 +35541,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred5_XQueryParser"
     synpred5_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:576:11: ( TRY LBRACKET )
-        // xquery/XQueryParser.g:576:12: TRY LBRACKET
+        // xquery/XQueryParser.g:578:11: ( TRY LBRACKET )
+        // xquery/XQueryParser.g:578:12: TRY LBRACKET
         this.match(this.input,TRY,XQueryParser.FOLLOW_TRY_in_synpred5_XQueryParser3655); if (this.state.failed) return ;
         this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred5_XQueryParser3657); if (this.state.failed) return ;
 
@@ -35508,10 +35552,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred6_XQueryParser"
     synpred6_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:862:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
-        // xquery/XQueryParser.g:862:12: VALIDATE ( p_ValidationMode | TYPE )?
-        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6185); if (this.state.failed) return ;
-        // xquery/XQueryParser.g:862:21: ( p_ValidationMode | TYPE )?
+        // xquery/XQueryParser.g:864:11: ( VALIDATE ( p_ValidationMode | TYPE )? )
+        // xquery/XQueryParser.g:864:12: VALIDATE ( p_ValidationMode | TYPE )?
+        this.match(this.input,VALIDATE,XQueryParser.FOLLOW_VALIDATE_in_synpred6_XQueryParser6189); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:864:21: ( p_ValidationMode | TYPE )?
         var alt263=3;
         var LA263_0 = this.input.LA(1);
 
@@ -35523,8 +35567,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
         }
         switch (alt263) {
             case 1 :
-                // xquery/XQueryParser.g:862:23: p_ValidationMode
-                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189);
+                // xquery/XQueryParser.g:864:23: p_ValidationMode
+                this.pushFollow(XQueryParser.FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193);
                 this.p_ValidationMode();
 
                 this.state._fsp--;
@@ -35533,8 +35577,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:862:42: TYPE
-                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6193); if (this.state.failed) return ;
+                // xquery/XQueryParser.g:864:42: TYPE
+                this.match(this.input,TYPE,XQueryParser.FOLLOW_TYPE_in_synpred6_XQueryParser6197); if (this.state.failed) return ;
 
 
                 break;
@@ -35548,10 +35592,10 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred7_XQueryParser"
     synpred7_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:907:11: ( SLASH p_RelativePathExpr )
-        // xquery/XQueryParser.g:907:12: SLASH p_RelativePathExpr
-        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6549); if (this.state.failed) return ;
-        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551);
+        // xquery/XQueryParser.g:909:11: ( SLASH p_RelativePathExpr )
+        // xquery/XQueryParser.g:909:12: SLASH p_RelativePathExpr
+        this.match(this.input,SLASH,XQueryParser.FOLLOW_SLASH_in_synpred7_XQueryParser6553); if (this.state.failed) return ;
+        this.pushFollow(XQueryParser.FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555);
         this.p_RelativePathExpr();
 
         this.state._fsp--;
@@ -35563,7 +35607,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred8_XQueryParser"
     synpred8_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:920:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
+        // xquery/XQueryParser.g:922:11: ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )
         // xquery/XQueryParser.g:
         if ( this.input.LA(1)==LPAREN||(this.input.LA(1)>=DOLLAR && this.input.LA(1)<=LBRACKET)||this.input.LA(1)==SMALLER||(this.input.LA(1)>=APOS && this.input.LA(1)<=QUOT) ) {
             this.input.consume();
@@ -35582,7 +35626,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred9_XQueryParser"
     synpred9_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:921:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
+        // xquery/XQueryParser.g:923:11: ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )
         var alt266=3;
         switch ( this.input.LA(1) ) {
         case ATTRIBUTE:
@@ -35608,9 +35652,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
         switch (alt266) {
             case 1 :
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
-                // xquery/XQueryParser.g:922:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:13: ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET )
+                // xquery/XQueryParser.g:924:14: ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET
                 if ( this.input.LA(1)==ATTRIBUTE||this.input.LA(1)==ELEMENT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -35621,7 +35665,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:922:36: ( p_QName )?
+                // xquery/XQueryParser.g:924:36: ( p_QName )?
                 var alt264=2;
                 var LA264_0 = this.input.LA(1);
 
@@ -35630,8 +35674,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt264) {
                     case 1 :
-                        // xquery/XQueryParser.g:922:36: p_QName
-                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6726);
+                        // xquery/XQueryParser.g:924:36: p_QName
+                        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred9_XQueryParser6730);
                         this.p_QName();
 
                         this.state._fsp--;
@@ -35642,7 +35686,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6729); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6733); if (this.state.failed) return ;
 
 
 
@@ -35650,9 +35694,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 2 :
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
-                // xquery/XQueryParser.g:923:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:13: ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET )
+                // xquery/XQueryParser.g:925:14: ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET
                 if ( this.input.LA(1)==NAMESPACE||this.input.LA(1)==PROCESSING_INSTRUCTION ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -35663,7 +35707,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                // xquery/XQueryParser.g:923:51: ( p_NCName )?
+                // xquery/XQueryParser.g:925:51: ( p_NCName )?
                 var alt265=2;
                 var LA265_0 = this.input.LA(1);
 
@@ -35672,8 +35716,8 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                 }
                 switch (alt265) {
                     case 1 :
-                        // xquery/XQueryParser.g:923:51: p_NCName
-                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6755);
+                        // xquery/XQueryParser.g:925:51: p_NCName
+                        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred9_XQueryParser6759);
                         this.p_NCName();
 
                         this.state._fsp--;
@@ -35684,7 +35728,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6758); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6762); if (this.state.failed) return ;
 
 
 
@@ -35692,9 +35736,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
                 break;
             case 3 :
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
-                // xquery/XQueryParser.g:924:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:13: ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET )
+                // xquery/XQueryParser.g:926:14: ( DOCUMENT | TEXT | COMMENT ) LBRACKET
                 if ( this.input.LA(1)==COMMENT||this.input.LA(1)==DOCUMENT||this.input.LA(1)==TEXT ) {
                     this.input.consume();
                     this.state.errorRecovery=false;this.state.failed=false;
@@ -35705,7 +35749,7 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
                     throw mse;
                 }
 
-                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6788); if (this.state.failed) return ;
+                this.match(this.input,LBRACKET,XQueryParser.FOLLOW_LBRACKET_in_synpred9_XQueryParser6792); if (this.state.failed) return ;
 
 
 
@@ -35718,9 +35762,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred10_XQueryParser"
     synpred10_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:926:11: ( p_KindTest )
-        // xquery/XQueryParser.g:926:12: p_KindTest
-        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6818);
+        // xquery/XQueryParser.g:928:11: ( p_KindTest )
+        // xquery/XQueryParser.g:928:12: p_KindTest
+        this.pushFollow(XQueryParser.FOLLOW_p_KindTest_in_synpred10_XQueryParser6822);
         this.p_KindTest();
 
         this.state._fsp--;
@@ -35732,14 +35776,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred11_XQueryParser"
     synpred11_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:927:11: ( p_QName LPAREN )
-        // xquery/XQueryParser.g:927:12: p_QName LPAREN
-        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6837);
+        // xquery/XQueryParser.g:929:11: ( p_QName LPAREN )
+        // xquery/XQueryParser.g:929:12: p_QName LPAREN
+        this.pushFollow(XQueryParser.FOLLOW_p_QName_in_synpred11_XQueryParser6841);
         this.p_QName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6839); if (this.state.failed) return ;
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred11_XQueryParser6843); if (this.state.failed) return ;
 
 
     },
@@ -35747,9 +35791,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred12_XQueryParser"
     synpred12_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:928:11: ( p_PrimaryExpr )
-        // xquery/XQueryParser.g:928:12: p_PrimaryExpr
-        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857);
+        // xquery/XQueryParser.g:930:11: ( p_PrimaryExpr )
+        // xquery/XQueryParser.g:930:12: p_PrimaryExpr
+        this.pushFollow(XQueryParser.FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861);
         this.p_PrimaryExpr();
 
         this.state._fsp--;
@@ -35761,9 +35805,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred13_XQueryParser"
     synpred13_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:986:11: ( p_Wildcard )
-        // xquery/XQueryParser.g:986:12: p_Wildcard
-        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296);
+        // xquery/XQueryParser.g:988:11: ( p_Wildcard )
+        // xquery/XQueryParser.g:988:12: p_Wildcard
+        this.pushFollow(XQueryParser.FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300);
         this.p_Wildcard();
 
         this.state._fsp--;
@@ -35775,14 +35819,14 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred14_XQueryParser"
     synpred14_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:987:11: ( p_NCName COLON )
-        // xquery/XQueryParser.g:987:12: p_NCName COLON
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7315);
+        // xquery/XQueryParser.g:989:11: ( p_NCName COLON )
+        // xquery/XQueryParser.g:989:12: p_NCName COLON
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred14_XQueryParser7319);
         this.p_NCName();
 
         this.state._fsp--;
         if (this.state.failed) return ;
-        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7317); if (this.state.failed) return ;
+        this.match(this.input,COLON,XQueryParser.FOLLOW_COLON_in_synpred14_XQueryParser7321); if (this.state.failed) return ;
 
 
     },
@@ -35790,9 +35834,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred15_XQueryParser"
     synpred15_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:988:11: ( p_NCName )
-        // xquery/XQueryParser.g:988:12: p_NCName
-        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7335);
+        // xquery/XQueryParser.g:990:11: ( p_NCName )
+        // xquery/XQueryParser.g:990:12: p_NCName
+        this.pushFollow(XQueryParser.FOLLOW_p_NCName_in_synpred15_XQueryParser7339);
         this.p_NCName();
 
         this.state._fsp--;
@@ -35804,9 +35848,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred16_XQueryParser"
     synpred16_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1025:11: ( LPAREN )
-        // xquery/XQueryParser.g:1025:12: LPAREN
-        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7591); if (this.state.failed) return ;
+        // xquery/XQueryParser.g:1027:11: ( LPAREN )
+        // xquery/XQueryParser.g:1027:12: LPAREN
+        this.match(this.input,LPAREN,XQueryParser.FOLLOW_LPAREN_in_synpred16_XQueryParser7595); if (this.state.failed) return ;
 
 
     },
@@ -35814,9 +35858,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred17_XQueryParser"
     synpred17_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:1304:26: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:1304:27: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602);
+        // xquery/XQueryParser.g:1306:26: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:1306:27: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -35828,9 +35872,9 @@ org.antlr.lang.augmentObject(XQueryParser.prototype, {
 
     // $ANTLR start "synpred18_XQueryParser"
     synpred18_XQueryParser_fragment: function() {
-        // xquery/XQueryParser.g:2136:44: ( p_OccurrenceIndicator )
-        // xquery/XQueryParser.g:2136:45: p_OccurrenceIndicator
-        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176);
+        // xquery/XQueryParser.g:2138:44: ( p_OccurrenceIndicator )
+        // xquery/XQueryParser.g:2138:45: p_OccurrenceIndicator
+        this.pushFollow(XQueryParser.FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224);
         this.p_OccurrenceIndicator();
 
         this.state._fsp--;
@@ -36111,7 +36155,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA1_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA1_specialS:
-        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
+        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
     DFA1_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -36188,7 +36232,7 @@ XQueryParser.DFA1 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "294:13: (vd= p_VersionDecl )?";
+        return "296:13: (vd= p_VersionDecl )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -36196,6 +36240,25 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA1_1 = input.LA(1);
+
+                             
+                            var index1_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
+
+                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA1_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index1_1);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA1_0 = input.LA(1);
 
                              
@@ -36216,25 +36279,6 @@ org.antlr.lang.extend(XQueryParser.DFA1, org.antlr.runtime.DFA, {
                             input.seek(index1_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA1_1 = input.LA(1);
-
-                             
-                            var index1_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA1_1==ENCODING||LA1_1==VERSION) ) {s = 6;}
-
-                            else if ( (LA1_1==AND||(LA1_1>=CAST && LA1_1<=CASTABLE)||LA1_1==DIV||LA1_1==EQ||LA1_1==EXCEPT||LA1_1==GE||(LA1_1>=GT && LA1_1<=IDIV)||(LA1_1>=INSTANCE && LA1_1<=IS)||LA1_1==LE||(LA1_1>=LT && LA1_1<=MOD)||LA1_1==NE||LA1_1==OR||(LA1_1>=TO && LA1_1<=TREAT)||LA1_1==UNION||LA1_1==CONTAINS||(LA1_1>=CONCAT && LA1_1<=LPAREN)||LA1_1==LSQUARE||LA1_1==EQUAL||LA1_1==NOTEQUAL||LA1_1==COMMA||(LA1_1>=STAR && LA1_1<=SLASH_SLASH)||LA1_1==COLON||LA1_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA1_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA1_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index1_1);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -36260,7 +36304,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA2_acceptS:
         "\u0002\uffff\u0004\u0002\u0001\u0001\u0003\u0002",
     DFA2_specialS:
-        "\u0001\u0001\u0001\u0000\u0008\uffff}>",
+        "\u0001\u0000\u0001\u0001\u0008\uffff}>",
     DFA2_transitionS: [
             "\u0002\u0002\u0004\u0004\u0001\u0002\u0006\u0004\u0001\u0002"+
             "\u0001\u0004\u0001\u0002\u0002\u0004\u0001\u0002\u0001\u0004"+
@@ -36337,7 +36381,7 @@ XQueryParser.DFA2 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "295:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
+        return "297:13: (lm= p_LibraryModule[$vd.tree] -> | mm= p_MainModule[$vd.tree] ->)";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -36345,25 +36389,6 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA2_1 = input.LA(1);
-
-                             
-                            var index2_1 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
-
-                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
-
-                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA2_1==EOF) ) {s = 9;}
-
-                             
-                            input.seek(index2_1);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
                             var LA2_0 = input.LA(1);
 
                              
@@ -36384,6 +36409,25 @@ org.antlr.lang.extend(XQueryParser.DFA2, org.antlr.runtime.DFA, {
                             input.seek(index2_0);
                             if ( s>=0 ) return s;
                             break;
+                        case 1 : 
+                            var LA2_1 = input.LA(1);
+
+                             
+                            var index2_1 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA2_1==NAMESPACE) ) {s = 6;}
+
+                            else if ( (LA2_1==AND||(LA2_1>=CAST && LA2_1<=CASTABLE)||LA2_1==DIV||LA2_1==EQ||LA2_1==EXCEPT||LA2_1==GE||(LA2_1>=GT && LA2_1<=IDIV)||(LA2_1>=INSTANCE && LA2_1<=IS)||LA2_1==LE||(LA2_1>=LT && LA2_1<=MOD)||LA2_1==NE||LA2_1==OR||(LA2_1>=TO && LA2_1<=TREAT)||LA2_1==UNION||LA2_1==CONTAINS||(LA2_1>=CONCAT && LA2_1<=LPAREN)||LA2_1==LSQUARE||LA2_1==EQUAL||LA2_1==NOTEQUAL||LA2_1==COMMA||(LA2_1>=STAR && LA2_1<=SLASH_SLASH)||LA2_1==COLON||LA2_1==VBAR) ) {s = 7;}
+
+                            else if ( (LA2_1==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA2_1==EOF) ) {s = 9;}
+
+                             
+                            input.seek(index2_1);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -36410,7 +36454,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0002\uffff\u0002\u0002\u0001\uffff\u0001\u0002\u0002\u0001\u0002"+
     "\u0002",
     DFA6_specialS:
-        "\u0001\u0001\u0001\u0000\u0002\uffff\u0001\u0002\u0005\uffff}>",
+        "\u0001\u0002\u0001\u0000\u0002\uffff\u0001\u0001\u0005\uffff}>",
     DFA6_transitionS: [
             "\u0002\u0002\u0004\u0005\u0001\u0002\u0006\u0005\u0001\u0002"+
             "\u0001\u0005\u0001\u0002\u0002\u0005\u0001\u0001\u0001\u0005"+
@@ -36501,7 +36545,7 @@ XQueryParser.DFA6 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "()* loopback of 330:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
+        return "()* loopback of 332:11: ( (dnd+= pm_DefaultNamespaceDecl | s+= p_Setter | nd+= pm_NamespaceDecl | i+= p_Import | fto+= pm_FTOptionDecl ) )*";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -36530,6 +36574,23 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             if ( s>=0 ) return s;
                             break;
                         case 1 : 
+                            var LA6_4 = input.LA(1);
+
+                             
+                            var index6_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
+
+                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
+
+                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
+
+                             
+                            input.seek(index6_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
                             var LA6_0 = input.LA(1);
 
                              
@@ -36550,23 +36611,6 @@ org.antlr.lang.extend(XQueryParser.DFA6, org.antlr.runtime.DFA, {
                             input.seek(index6_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA6_4 = input.LA(1);
-
-                             
-                            var index6_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA6_4==EOF||LA6_4==AND||(LA6_4>=CAST && LA6_4<=CASTABLE)||LA6_4==DIV||LA6_4==EQ||LA6_4==EXCEPT||LA6_4==GE||(LA6_4>=GT && LA6_4<=IDIV)||(LA6_4>=INSTANCE && LA6_4<=IS)||LA6_4==LE||(LA6_4>=LT && LA6_4<=MOD)||LA6_4==NE||LA6_4==OR||(LA6_4>=TO && LA6_4<=TREAT)||LA6_4==UNION||LA6_4==CONTAINS||(LA6_4>=CONCAT && LA6_4<=LPAREN)||LA6_4==LSQUARE||LA6_4==EQUAL||LA6_4==NOTEQUAL||LA6_4==COMMA||(LA6_4>=STAR && LA6_4<=SLASH_SLASH)||LA6_4==COLON||LA6_4==VBAR) ) {s = 9;}
-
-                            else if ( (LA6_4==SEMICOLON) && ((this.lc(XQS)))) {s = 8;}
-
-                            else if ( (LA6_4==MODULE||LA6_4==SCHEMA) ) {s = 7;}
-
-                             
-                            input.seek(index6_4);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -36650,7 +36694,7 @@ XQueryParser.DFA9 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA9, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "356:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
+        return "358:1: p_Setter : ( pm_BoundarySpaceDecl | pm_DefaultCollationDecl | pm_BaseURIDecl | pm_ConstructionDecl | pm_OrderingModeDecl | pm_EmptyOrderDecl | {...}? => pm_RevalidationDecl | pm_CopyNamespacesDecl | pm_DecimalFormatDecl );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -36857,7 +36901,7 @@ XQueryParser.DFA44 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "535:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
+        return "537:1: pm_QueryBody : ({...}? => p_Program | p_Expr[true,true] );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -37755,7 +37799,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_50 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -37890,7 +37934,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_59 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -37905,7 +37949,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_60 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -37920,7 +37964,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_61 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -37935,7 +37979,7 @@ org.antlr.lang.extend(XQueryParser.DFA44, org.antlr.runtime.DFA, {
                             var index44_62 = input.index();
                             input.rewind();
                             s = -1;
-                            if ( ((((this.lc(XQS))&&(this.lc(XQU)))||(this.lc(XQS)))) ) {s = 67;}
+                            if ( (((this.lc(XQS))||((this.lc(XQS))&&(this.lc(XQU))))) ) {s = 67;}
 
                             else if ( (true) ) {s = 71;}
 
@@ -38059,8 +38103,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
         "\u0007\uffff\u0001\u0006\u0005\u0001\u0001\u0002\u0001\u0003\u0001"+
     "\u0004\u0001\u0005",
     DFA46_specialS:
-        "\u0001\uffff\u0001\u0003\u0001\u0000\u0001\u0005\u0001\u0002\u0001"+
-    "\u0004\u0001\u0001\u000a\uffff}>",
+        "\u0001\uffff\u0001\u0005\u0001\u0003\u0001\u0002\u0001\u0000\u0001"+
+    "\u0001\u0001\u0004\u000a\uffff}>",
     DFA46_transitionS: [
             "\u0025\u0007\u0001\u0001\u0005\u0007\u0001\u0003\u000a\u0007"+
             "\u0001\u0002\u0021\u0007\u0001\u0005\u001d\u0007\u0001\u0004"+
@@ -38211,7 +38255,7 @@ XQueryParser.DFA46 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "571:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
+        return "573:1: p_ExprSingle[strict] : ( ( ( ( FOR | LET ) DOLLAR ) | ( FOR ( TUMBLING | SLIDING ) ) )=> p_FLWORHybrid[$strict] | ( IF LPAREN )=> p_IfHybrid[$strict] | ( SWITCH LPAREN )=> p_SwitchHybrid[$strict] | ( TYPESWITCH LPAREN )=> p_TypeswitchHybrid[$strict] | ( TRY LBRACKET )=> p_TryCatchHybrid[$strict] | p_ExprSimple );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -38219,6 +38263,51 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA46_4 = input.LA(1);
+
+                             
+                            var index46_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
+
+                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
+                            var LA46_5 = input.LA(1);
+
+                             
+                            var index46_5 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
+
+                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_5);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 2 : 
+                            var LA46_3 = input.LA(1);
+
+                             
+                            var index46_3 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
+
+                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
+
+                             
+                            input.seek(index46_3);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
                             var LA46_2 = input.LA(1);
 
                              
@@ -38235,7 +38324,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_2);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
+                        case 4 : 
                             var LA46_6 = input.LA(1);
 
                              
@@ -38250,22 +38339,7 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_6);
                             if ( s>=0 ) return s;
                             break;
-                        case 2 : 
-                            var LA46_4 = input.LA(1);
-
-                             
-                            var index46_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_4==LPAREN) && (this.synpred3_XQueryParser())) {s = 14;}
-
-                            else if ( (LA46_4==EOF||(LA46_4>=AND && LA46_4<=ASCENDING)||(LA46_4>=CASE && LA46_4<=CASTABLE)||LA46_4==COLLATION||LA46_4==DEFAULT||(LA46_4>=DESCENDING && LA46_4<=DIV)||LA46_4==EMPTY||LA46_4==EQ||LA46_4==EXCEPT||LA46_4==FOR||LA46_4==GE||(LA46_4>=GT && LA46_4<=IDIV)||(LA46_4>=INSTANCE && LA46_4<=IS)||LA46_4==LE||(LA46_4>=LET && LA46_4<=MOD)||LA46_4==NE||(LA46_4>=OR && LA46_4<=ORDER)||(LA46_4>=RETURN && LA46_4<=SATISFIES)||LA46_4==STABLE||(LA46_4>=TO && LA46_4<=TREAT)||LA46_4==UNION||LA46_4==WHERE||LA46_4==COUNT||(LA46_4>=END && LA46_4<=GROUP)||LA46_4==ONLY||LA46_4==START||(LA46_4>=AFTER && LA46_4<=BEFORE)||LA46_4==INTO||LA46_4==MODIFY||LA46_4==WITH||LA46_4==CONTAINS||LA46_4==CONCAT||LA46_4==RPAREN||(LA46_4>=RBRACKET && LA46_4<=EQUAL)||LA46_4==NOTEQUAL||LA46_4==COMMA||(LA46_4>=STAR && LA46_4<=SLASH_SLASH)||LA46_4==COLON||(LA46_4>=SEMICOLON && LA46_4<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 3 : 
+                        case 5 : 
                             var LA46_1 = input.LA(1);
 
                              
@@ -38284,36 +38358,6 @@ org.antlr.lang.extend(XQueryParser.DFA46, org.antlr.runtime.DFA, {
                             input.seek(index46_1);
                             if ( s>=0 ) return s;
                             break;
-                        case 4 : 
-                            var LA46_5 = input.LA(1);
-
-                             
-                            var index46_5 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_5==LPAREN) && (this.synpred4_XQueryParser())) {s = 15;}
-
-                            else if ( (LA46_5==EOF||(LA46_5>=AND && LA46_5<=ASCENDING)||(LA46_5>=CASE && LA46_5<=CASTABLE)||LA46_5==COLLATION||LA46_5==DEFAULT||(LA46_5>=DESCENDING && LA46_5<=DIV)||LA46_5==EMPTY||LA46_5==EQ||LA46_5==EXCEPT||LA46_5==FOR||LA46_5==GE||(LA46_5>=GT && LA46_5<=IDIV)||(LA46_5>=INSTANCE && LA46_5<=IS)||LA46_5==LE||(LA46_5>=LET && LA46_5<=MOD)||LA46_5==NE||(LA46_5>=OR && LA46_5<=ORDER)||(LA46_5>=RETURN && LA46_5<=SATISFIES)||LA46_5==STABLE||(LA46_5>=TO && LA46_5<=TREAT)||LA46_5==UNION||LA46_5==WHERE||LA46_5==COUNT||(LA46_5>=END && LA46_5<=GROUP)||LA46_5==ONLY||LA46_5==START||(LA46_5>=AFTER && LA46_5<=BEFORE)||LA46_5==INTO||LA46_5==MODIFY||LA46_5==WITH||LA46_5==CONTAINS||LA46_5==CONCAT||LA46_5==RPAREN||(LA46_5>=RBRACKET && LA46_5<=EQUAL)||LA46_5==NOTEQUAL||LA46_5==COMMA||(LA46_5>=STAR && LA46_5<=SLASH_SLASH)||LA46_5==COLON||(LA46_5>=SEMICOLON && LA46_5<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_5);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 5 : 
-                            var LA46_3 = input.LA(1);
-
-                             
-                            var index46_3 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA46_3==LPAREN) && (this.synpred2_XQueryParser())) {s = 13;}
-
-                            else if ( (LA46_3==EOF||(LA46_3>=AND && LA46_3<=ASCENDING)||(LA46_3>=CASE && LA46_3<=CASTABLE)||LA46_3==COLLATION||LA46_3==DEFAULT||(LA46_3>=DESCENDING && LA46_3<=DIV)||LA46_3==EMPTY||LA46_3==EQ||LA46_3==EXCEPT||LA46_3==FOR||LA46_3==GE||(LA46_3>=GT && LA46_3<=IDIV)||(LA46_3>=INSTANCE && LA46_3<=IS)||LA46_3==LE||(LA46_3>=LET && LA46_3<=MOD)||LA46_3==NE||(LA46_3>=OR && LA46_3<=ORDER)||(LA46_3>=RETURN && LA46_3<=SATISFIES)||LA46_3==STABLE||(LA46_3>=TO && LA46_3<=TREAT)||LA46_3==UNION||LA46_3==WHERE||LA46_3==COUNT||(LA46_3>=END && LA46_3<=GROUP)||LA46_3==ONLY||LA46_3==START||(LA46_3>=AFTER && LA46_3<=BEFORE)||LA46_3==INTO||LA46_3==MODIFY||LA46_3==WITH||LA46_3==CONTAINS||LA46_3==CONCAT||LA46_3==RPAREN||(LA46_3>=RBRACKET && LA46_3<=EQUAL)||LA46_3==NOTEQUAL||LA46_3==COMMA||(LA46_3>=STAR && LA46_3<=SLASH_SLASH)||LA46_3==COLON||(LA46_3>=SEMICOLON && LA46_3<=VBAR)) ) {s = 7;}
-
-                             
-                            input.seek(index46_3);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -38436,7 +38480,7 @@ XQueryParser.DFA117 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA117, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "906:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
+        return "908:1: p_PathExpr : ( ( SLASH p_RelativePathExpr )=> ( SLASH p_RelativePathExpr ) | SLASH | SLASH_SLASH p_RelativePathExpr | p_RelativePathExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -38601,7 +38645,7 @@ XQueryParser.DFA119 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "919:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
+        return "921:1: p_StepExpr : ( ( LBRACKET | LPAREN | SMALLER | QUOT | APOS | DOLLAR )=> p_PostfixExpr | ( ( ( ELEMENT | ATTRIBUTE ) ( p_QName )? LBRACKET ) | ( ( NAMESPACE | PROCESSING_INSTRUCTION ) ( p_NCName )? LBRACKET ) | ( ( DOCUMENT | TEXT | COMMENT ) LBRACKET ) )=> p_PostfixExpr | ( p_KindTest )=> p_AxisStep | ( p_QName LPAREN )=> p_PostfixExpr | ( p_PrimaryExpr )=> p_PostfixExpr | p_AxisStep );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -39014,13 +39058,13 @@ org.antlr.lang.extend(XQueryParser.DFA119, org.antlr.runtime.DFA, {
                             s = -1;
                             if ( ((this.synpred8_XQueryParser()||(this.synpred8_XQueryParser()&&(this.lc(MLS))))) ) {s = 45;}
 
-                            else if ( (((this.synpred9_XQueryParser()&&(this.lc(MLS)))||this.synpred9_XQueryParser())) ) {s = 46;}
+                            else if ( ((this.synpred9_XQueryParser()||(this.synpred9_XQueryParser()&&(this.lc(MLS))))) ) {s = 46;}
 
                             else if ( (this.synpred10_XQueryParser()) ) {s = 49;}
 
-                            else if ( (((this.synpred11_XQueryParser()&&(this.lc(MLS)))||this.synpred11_XQueryParser())) ) {s = 47;}
+                            else if ( ((this.synpred11_XQueryParser()||(this.synpred11_XQueryParser()&&(this.lc(MLS))))) ) {s = 47;}
 
-                            else if ( ((this.synpred12_XQueryParser()||(this.synpred12_XQueryParser()&&(this.lc(MLS))))) ) {s = 48;}
+                            else if ( (((this.synpred12_XQueryParser()&&(this.lc(MLS)))||this.synpred12_XQueryParser())) ) {s = 48;}
 
                             else if ( (true) ) {s = 50;}
 
@@ -39746,7 +39790,7 @@ XQueryParser.DFA121 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA121, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "938:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
+        return "940:1: p_ForwardStep : ( p_ForwardAxis p_NodeTest | p_AbbrevForwardStep );";
     },
     dummy: null
 });
@@ -39983,7 +40027,7 @@ XQueryParser.DFA126 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA126, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "980:1: p_NodeTest : ( p_KindTest | p_NameTest );";
+        return "982:1: p_NodeTest : ( p_KindTest | p_NameTest );";
     },
     dummy: null
 });
@@ -40004,7 +40048,7 @@ org.antlr.lang.augmentObject(XQueryParser, {
     "\uffff\u0001\u0005\u0002\uffff\u0001\u0008\u0006\uffff\u0001\u0009\u0001"+
     "\u0006\u0001\u0007\u0002\u0008",
     DFA134_specialS:
-        "\u0001\u0000\u000d\uffff\u0001\u0001\u0007\uffff}>",
+        "\u0001\u0001\u000d\uffff\u0001\u0000\u0007\uffff}>",
     DFA134_transitionS: [
             "\u0006\u0007\u0001\u000c\u0008\u0007\u0001\u000f\u0008\u0007"+
             "\u0001\u0009\u0001\u0007\u0001\u0006\u001f\u0007\u0001\u000b"+
@@ -40084,7 +40128,7 @@ XQueryParser.DFA134 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1024:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
+        return "1026:1: p_PrimaryExpr : ( ( LPAREN )=> p_ParenthesizedExpr | p_Literal | p_VarRef | p_ContextItemExpr | p_FunctionCall | p_OrderedExpr | p_UnorderedExpr | p_Constructor | p_BlockExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -40092,6 +40136,21 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
+                            var LA134_14 = input.LA(1);
+
+                             
+                            var index134_14 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
+
+                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
+
+                             
+                            input.seek(index134_14);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 1 : 
                             var LA134_0 = input.LA(1);
 
                              
@@ -40136,21 +40195,6 @@ org.antlr.lang.extend(XQueryParser.DFA134, org.antlr.runtime.DFA, {
                             input.seek(index134_0);
                             if ( s>=0 ) return s;
                             break;
-                        case 1 : 
-                            var LA134_14 = input.LA(1);
-
-                             
-                            var index134_14 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA134_14==LPAREN||LA134_14==COLON) ) {s = 7;}
-
-                            else if ( (LA134_14==LBRACKET) && ((this.lc(MLS)))) {s = 20;}
-
-                             
-                            input.seek(index134_14);
-                            if ( s>=0 ) return s;
-                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -40310,7 +40354,7 @@ XQueryParser.DFA162 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA162, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1304:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
+        return "1306:25: ( ( p_OccurrenceIndicator )=>oi= p_OccurrenceIndicator )?";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -40663,7 +40707,7 @@ XQueryParser.DFA164 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA164, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1314:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
+        return "1316:1: p_ItemType : ( p_KindTest -> ^( KindTest p_KindTest ) | {...}? => ( BINARY LPAREN RPAREN ) -> ^( BinaryTest BINARY LPAREN RPAREN ) | ( ITEM LPAREN RPAREN ) -> ^( ItemTest ITEM LPAREN RPAREN ) | p_AtomicOrUnionType | p_ParenthesizedItemType );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -40767,7 +40811,7 @@ XQueryParser.DFA218 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA218, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1850:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
+        return "1852:1: p_FTMatchOption : ( p_FTLanguageOption | p_FTWildCardOption | p_FTThesaurusOption | p_FTStemOption | p_FTCaseOption | p_FTDiacriticsOption | p_FTStopWordOption | p_FTExtensionOption );";
     },
     dummy: null
 });
@@ -40908,7 +40952,7 @@ XQueryParser.DFA237 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA237, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "1964:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
+        return "1966:1: p_Hybrid[strict, allowConcat] : ( p_HybridExprSingle[$strict,$allowConcat] | p_Statement );";
     },
     dummy: null
 });
@@ -40924,8 +40968,8 @@ org.antlr.lang.augmentObject(XQueryParser, {
     DFA253_acceptS:
         "\u0003\uffff\u0001\u0002\u0005\uffff\u0001\u0001\u0001\u0003",
     DFA253_specialS:
-        "\u0004\uffff\u0001\u0000\u0001\u0004\u0001\u0003\u0001\u0002\u0001"+
-    "\u0001\u0002\uffff}>",
+        "\u0004\uffff\u0001\u0002\u0001\u0001\u0001\u0004\u0001\u0000\u0001"+
+    "\u0003\u0002\uffff}>",
     DFA253_transitionS: [
             "\u0020\u0003\u0001\u0002\u002f\u0003\u0001\u0001\u002e\u0003"+
             "\u0001\u0008\u0001\u0005\u0001\u0003\u0001\u0004\u0004\u0003"+
@@ -41086,7 +41130,7 @@ XQueryParser.DFA253 = function(recognizer) {
 
 org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
     getDescription: function() {
-        return "2116:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
+        return "2118:1: p_ExprSimple : ( p_QuantifiedExpr | p_OrExpr | {...}? => pg_UpdateExpr );";
     },
     specialStateTransition: function(s, input) {
         var _s = s;
@@ -41094,36 +41138,6 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
         var retval = (function(s, input) {
             switch ( s ) {
                         case 0 : 
-                            var LA253_4 = input.LA(1);
-
-                             
-                            var index253_4 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
-
-                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
-
-                             
-                            input.seek(index253_4);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 1 : 
-                            var LA253_8 = input.LA(1);
-
-                             
-                            var index253_8 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_8);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 2 : 
                             var LA253_7 = input.LA(1);
 
                              
@@ -41138,22 +41152,7 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_7);
                             if ( s>=0 ) return s;
                             break;
-                        case 3 : 
-                            var LA253_6 = input.LA(1);
-
-                             
-                            var index253_6 = input.index();
-                            input.rewind();
-                            s = -1;
-                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
-
-                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
-
-                             
-                            input.seek(index253_6);
-                            if ( s>=0 ) return s;
-                            break;
-                        case 4 : 
+                        case 1 : 
                             var LA253_5 = input.LA(1);
 
                              
@@ -41168,6 +41167,51 @@ org.antlr.lang.extend(XQueryParser.DFA253, org.antlr.runtime.DFA, {
                             input.seek(index253_5);
                             if ( s>=0 ) return s;
                             break;
+                        case 2 : 
+                            var LA253_4 = input.LA(1);
+
+                             
+                            var index253_4 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_4==EOF||(LA253_4>=AND && LA253_4<=ASCENDING)||(LA253_4>=CASE && LA253_4<=CASTABLE)||LA253_4==COLLATION||LA253_4==DEFAULT||(LA253_4>=DESCENDING && LA253_4<=DIV)||LA253_4==EMPTY||LA253_4==EQ||LA253_4==EXCEPT||LA253_4==FOR||LA253_4==GE||(LA253_4>=GT && LA253_4<=IDIV)||(LA253_4>=INSTANCE && LA253_4<=IS)||LA253_4==LE||(LA253_4>=LET && LA253_4<=MOD)||LA253_4==NE||(LA253_4>=OR && LA253_4<=ORDER)||(LA253_4>=RETURN && LA253_4<=SATISFIES)||LA253_4==STABLE||(LA253_4>=TO && LA253_4<=TREAT)||LA253_4==UNION||LA253_4==WHERE||LA253_4==COUNT||(LA253_4>=END && LA253_4<=GROUP)||LA253_4==ONLY||LA253_4==START||(LA253_4>=AFTER && LA253_4<=BEFORE)||LA253_4==INTO||LA253_4==MODIFY||LA253_4==WITH||LA253_4==CONTAINS||(LA253_4>=CONCAT && LA253_4<=RPAREN)||(LA253_4>=RBRACKET && LA253_4<=EQUAL)||LA253_4==NOTEQUAL||LA253_4==COMMA||(LA253_4>=STAR && LA253_4<=SLASH_SLASH)||LA253_4==COLON||(LA253_4>=SEMICOLON && LA253_4<=VBAR)) ) {s = 3;}
+
+                            else if ( (LA253_4==NODE||LA253_4==NODES) && ((this.lc(XQU)))) {s = 10;}
+
+                             
+                            input.seek(index253_4);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 3 : 
+                            var LA253_8 = input.LA(1);
+
+                             
+                            var index253_8 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_8==DOLLAR) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_8==EOF||(LA253_8>=AND && LA253_8<=ASCENDING)||(LA253_8>=CASE && LA253_8<=CASTABLE)||LA253_8==COLLATION||LA253_8==DEFAULT||(LA253_8>=DESCENDING && LA253_8<=DIV)||LA253_8==EMPTY||LA253_8==EQ||LA253_8==EXCEPT||LA253_8==FOR||LA253_8==GE||(LA253_8>=GT && LA253_8<=IDIV)||(LA253_8>=INSTANCE && LA253_8<=IS)||LA253_8==LE||(LA253_8>=LET && LA253_8<=MOD)||LA253_8==NE||(LA253_8>=OR && LA253_8<=ORDER)||(LA253_8>=RETURN && LA253_8<=SATISFIES)||LA253_8==STABLE||(LA253_8>=TO && LA253_8<=TREAT)||LA253_8==UNION||LA253_8==WHERE||LA253_8==COUNT||(LA253_8>=END && LA253_8<=GROUP)||LA253_8==ONLY||LA253_8==START||(LA253_8>=AFTER && LA253_8<=BEFORE)||LA253_8==INTO||LA253_8==MODIFY||LA253_8==WITH||LA253_8==CONTAINS||(LA253_8>=CONCAT && LA253_8<=RPAREN)||(LA253_8>=RBRACKET && LA253_8<=EQUAL)||LA253_8==NOTEQUAL||LA253_8==COMMA||(LA253_8>=STAR && LA253_8<=SLASH_SLASH)||LA253_8==COLON||(LA253_8>=SEMICOLON && LA253_8<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_8);
+                            if ( s>=0 ) return s;
+                            break;
+                        case 4 : 
+                            var LA253_6 = input.LA(1);
+
+                             
+                            var index253_6 = input.index();
+                            input.rewind();
+                            s = -1;
+                            if ( (LA253_6==NODE) && ((this.lc(XQU)))) {s = 10;}
+
+                            else if ( (LA253_6==EOF||(LA253_6>=AND && LA253_6<=ASCENDING)||(LA253_6>=CASE && LA253_6<=CASTABLE)||LA253_6==COLLATION||LA253_6==DEFAULT||(LA253_6>=DESCENDING && LA253_6<=DIV)||LA253_6==EMPTY||LA253_6==EQ||LA253_6==EXCEPT||LA253_6==FOR||LA253_6==GE||(LA253_6>=GT && LA253_6<=IDIV)||(LA253_6>=INSTANCE && LA253_6<=IS)||LA253_6==LE||(LA253_6>=LET && LA253_6<=MOD)||LA253_6==NE||(LA253_6>=OR && LA253_6<=ORDER)||(LA253_6>=RETURN && LA253_6<=SATISFIES)||LA253_6==STABLE||(LA253_6>=TO && LA253_6<=TREAT)||LA253_6==UNION||LA253_6==WHERE||LA253_6==COUNT||(LA253_6>=END && LA253_6<=GROUP)||LA253_6==ONLY||LA253_6==START||(LA253_6>=AFTER && LA253_6<=BEFORE)||LA253_6==INTO||LA253_6==MODIFY||LA253_6==WITH||LA253_6==CONTAINS||(LA253_6>=CONCAT && LA253_6<=RPAREN)||(LA253_6>=RBRACKET && LA253_6<=EQUAL)||LA253_6==NOTEQUAL||LA253_6==COMMA||(LA253_6>=STAR && LA253_6<=SLASH_SLASH)||LA253_6==COLON||(LA253_6>=SEMICOLON && LA253_6<=VBAR)) ) {s = 3;}
+
+                             
+                            input.seek(index253_6);
+                            if ( s>=0 ) return s;
+                            break;
             }
         }).call(this.recognizer, s, input);
         if (!org.antlr.lang.isUndefined(retval)) {
@@ -41415,1025 +41459,1025 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_p_OrderByClause_in_p_IntermediateClause3786: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_CountClause_in_p_IntermediateClause3790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_p_RangeExpr_in_p_StringConcatExpr3811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_CONCAT_in_p_StringConcatExpr3815: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_FOR_in_p_ForClause3844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ForClause3851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_ForBinding_in_p_ForClause3853: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_ForBinding3883: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_TypeDeclaration_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
-    FOLLOW_p_AllowingEmpty_in_p_ForBinding3894: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_PositionalVar_in_p_ForBinding3897: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_p_FTScoreVar_in_p_ForBinding3900: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_ForBinding3905: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALLOWING_in_p_AllowingEmpty3938: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
-    FOLLOW_EMPTY_in_p_AllowingEmpty3944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_PositionalVar3974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_PositionalVar3980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LET_in_p_LetClause4014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_LetClause4021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
-    FOLLOW_p_LetBinding_in_p_LetClause4023: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_LetBinding4057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_TypeDeclaration_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_p_FTScoreVar_in_p_LetBinding4071: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_LetBinding4077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOR_in_p_WindowClause4106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
-    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TUMBLING_in_p_TumblingWindowClause4152: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_TumblingWindowClause4158: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TumblingWindowClause4164: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_TumblingWindowClause4177: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4184: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4186: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLIDING_in_p_SlidingWindowClause4215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_WINDOW_in_p_SlidingWindowClause4221: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_SlidingWindowClause4227: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_SlidingWindowClause4240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
-    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4249: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_START_in_p_WindowStartCondition4278: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ONLY_in_p_WindowEndCondition4320: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_WindowEndCondition4328: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_WindowVars_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
-    FOLLOW_WHEN_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4370: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CurrentItem_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_p_PositionalVar_in_p_WindowVars4380: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
-    FOLLOW_PREVIOUS_in_p_WindowVars4386: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PreviousItem_in_p_WindowVars4392: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_NEXT_in_p_WindowVars4399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NextItem_in_p_WindowVars4405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_CurrentItem4433: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_PreviousItem4459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NextItem4485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COUNT_in_p_CountClause4513: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CountClause4519: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CountClause4523: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHERE_in_p_WhereClause4561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GROUP_in_p_GroupByClause4594: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_GroupByClause4600: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_GroupingSpecList4633: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_DOLLAR_in_p_GroupingSpec4665: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_GroupingSpec4676: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4712: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_STABLE_in_p_OrderByClause4724: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
-    FOLLOW_ORDER_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpecList_in_p_OrderByClause4738: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_OrderSpecList4767: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_OrderSpec_in_p_OrderSpecList4769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_ExprSingle_in_p_OrderSpec4797: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
-    FOLLOW_p_OrderModifier_in_p_OrderSpec4800: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ASCENDING_in_p_OrderModifier4829: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_DESCENDING_in_p_OrderModifier4835: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
-    FOLLOW_EMPTY_in_p_OrderModifier4842: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
-    FOLLOW_GREATEST_in_p_OrderModifier4847: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_LEAST_in_p_OrderModifier4853: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_OrderModifier4861: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_OrderModifier4863: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnHybrid4896: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SOME_in_p_QuantifiedExpr4930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_EVERY_in_p_QuantifiedExpr4936: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4956: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
-    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_QuantifiedExpr4981: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_SATISFIES_in_p_QuantifiedExpr4992: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchHybrid5026: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchHybrid5032: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchHybrid5035: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5037: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchHybrid5043: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchHybrid5049: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseHybrid5084: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseHybrid5094: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchHybrid5161: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchHybrid5164: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5166: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5172: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5179: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchHybrid5191: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseHybrid5225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseHybrid5232: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseHybrid5242: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_SequenceTypeUnion5286: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_IF_in_p_IfHybrid5319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfHybrid5325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfHybrid5328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfHybrid5341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TryClause_in_p_TryCatchExpr5372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_p_CatchClause_in_p_TryCatchExpr5374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryClause5403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_TryClause5407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TryTargetExpr_in_p_TryClause5409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TryTargetExpr5437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CATCH_in_p_CatchClause5466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CatchClause5472: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CatchClause5477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5503: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_VBAR_in_p_CatchErrorList5506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_CatchErrorList5508: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_OR_in_p_OrExpr5559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AndExpr_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5592: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_AND_in_p_AndExpr5598: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ComparisonExpr_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5632: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
-    FOLLOW_p_ValueComp_in_p_ComparisonExpr5637: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5677: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_RangeExpr5683: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5716: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_PLUS_in_p_AdditiveExpr5723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_AdditiveExpr5731: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5765: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_MultiplicativeExpr5772: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DIV_in_p_MultiplicativeExpr5781: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_IDIV_in_p_MultiplicativeExpr5787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MOD_in_p_MultiplicativeExpr5793: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5799: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5828: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_UNION_in_p_UnionExpr5835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_VBAR_in_p_UnionExpr5841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5873: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5880: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5886: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5891: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
-    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5920: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
-    FOLLOW_INSTANCE_in_p_InstanceofExpr5926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_InstanceofExpr5932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastableExpr_in_p_TreatExpr5964: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_TREAT_in_p_TreatExpr5970: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TreatExpr5976: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CastExpr_in_p_CastableExpr6017: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
-    FOLLOW_CASTABLE_in_p_CastableExpr6023: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastableExpr6029: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnaryExpr_in_p_CastExpr6070: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
-    FOLLOW_CAST_in_p_CastExpr6076: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CastExpr6082: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SingleType_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PLUS_in_p_UnaryExpr6118: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_MINUS_in_p_UnaryExpr6126: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ValueExpr_in_p_UnaryExpr6131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ValidateExpr_in_p_ValueExpr6201: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ValueExpr6213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6225: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQUAL_in_p_GeneralComp6254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NOTEQUAL_in_p_GeneralComp6260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_GeneralComp6266: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLEREQ_in_p_GeneralComp6272: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_GeneralComp6278: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATEREQ_in_p_GeneralComp6284: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EQ_in_p_ValueComp6316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NE_in_p_ValueComp6322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LT_in_p_ValueComp6328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LE_in_p_ValueComp6334: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GT_in_p_ValueComp6340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GE_in_p_ValueComp6346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IS_in_p_NodeComp6377: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_GREATER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_p_ValidateExpr6415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_ValidationMode_in_p_ValidateExpr6421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_TYPE_in_p_ValidateExpr6427: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_ValidateExpr6436: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ValidateExpr6438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ValidateExpr6441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LAX_in_p_ValidationMode6470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STRICT_in_p_ValidationMode6476: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_ExtensionExpr6505: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_ExtensionExpr6508: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ExtensionExpr6510: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6557: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6559: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_p_PathExpr6572: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_SLASH_in_p_PathExpr6584: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6586: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_p_PathExpr6598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6626: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_set_in_p_RelativePathExpr6629: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StepExpr_in_p_RelativePathExpr6637: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6823: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6844: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PostfixExpr_in_p_StepExpr6862: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AxisStep_in_p_StepExpr6874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseStep_in_p_AxisStep6901: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_ForwardStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_PredicateList_in_p_AxisStep6908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ForwardAxis_in_p_ForwardStep6934: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ForwardStep6936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CHILD_in_p_ForwardAxis6974: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6976: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_in_p_ForwardAxis6988: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis6990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7002: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SELF_in_p_ForwardAxis7016: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7044: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7046: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOLLOWING_in_p_ForwardAxis7058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ForwardAxis7060: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReverseAxis_in_p_ReverseStep7115: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NodeTest_in_p_ReverseStep7117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARENT_in_p_ReverseAxis7155: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_in_p_ReverseAxis7169: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7183: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PRECEDING_in_p_ReverseAxis7197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7211: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_COLON_COLON_in_p_ReverseAxis7213: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_NodeTest7265: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NameTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_p_NameTest7301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_NameTest7340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_Wildcard7370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7373: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Wildcard7389: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Wildcard7405: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_p_Wildcard7407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7447: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_p_Predicate_in_p_PostfixExpr7450: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LPAREN_in_p_ArgumentList7491: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ArgumentList7497: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Argument_in_p_ArgumentList7499: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_ArgumentList7505: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Predicate_in_p_PredicateList7531: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
-    FOLLOW_LSQUARE_in_p_Predicate7558: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_Predicate7560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
-    FOLLOW_RSQUARE_in_p_Predicate7563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Literal_in_p_PrimaryExpr7608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarRef_in_p_PrimaryExpr7620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7632: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7644: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Constructor_in_p_PrimaryExpr7680: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7694: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NumericLiteral_in_p_Literal7720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7752: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarRef7806: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarRef7810: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_VarName7838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedExpr7864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_ParenthesizedExpr7866: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOT_in_p_ContextItemExpr7896: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_OrderedExpr7924: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_OrderedExpr7930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_OrderedExpr7933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNORDERED_in_p_UnorderedExpr7961: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_UnorderedExpr7967: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_UnorderedExpr7970: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_FQName_in_p_FunctionCall7999: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_ArgumentList_in_p_FunctionCall8004: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_Argument8030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8035: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_p_Constructor8087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ComputedConstructor_in_p_Constructor8099: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8125: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8137: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8149: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SMALLER_in_p_DirElemConstructor8176: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
-    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8197: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
-    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8216: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8218: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
-    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8221: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_GREATER_in_p_DirElemConstructor8232: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8309: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_DirAttributeList8314: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_EQUAL_in_p_DirAttributeList8321: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_S_in_p_DirAttributeList8323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
-    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8328: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8360: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8363: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8367: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8371: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8414: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8417: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_QUOT_in_p_DirAttributeValue8421: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8425: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
-    FOLLOW_APOS_in_p_DirAttributeValue8429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8485: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8511: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8541: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CDataSection_in_pm_DirElemContent8553: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CommonContent_in_pm_DirElemContent8565: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CharRef_in_pm_CommonContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8629: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8653: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8701: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8715: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8746: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8782: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_CDataSection_in_p_CDataSection8817: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8873: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8936: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_in_pm_CompDocConstructor8965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompDocConstructor8969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor8971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompDocConstructor8973: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_pm_CompElemConstructor9009: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompElemConstructor9014: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9019: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompElemConstructor9021: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9024: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompElemConstructor9028: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompElemConstructor9032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9059: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_pm_CompAttrConstructor9093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompAttrConstructor9100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9103: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9107: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9111: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9139: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9144: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9149: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9153: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9157: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9162: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_Prefix9188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_PrefixExpr9214: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_URIExpr9241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_CompTextConstructor9270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompTextConstructor9274: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompTextConstructor9276: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompTextConstructor9279: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_CompBinaryConstructor9307: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9311: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_CompBinaryConstructor9313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9316: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_pm_CompCommentConstructor9345: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9349: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9351: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9353: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9382: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pm_CompPIConstructor9387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9392: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_pm_CompPIConstructor9394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_pm_CompPIConstructor9401: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_pm_CompPIConstructor9405: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_SingleType9451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_TypeDeclaration9480: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypeDeclaration9486: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9539: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SequenceType9545: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SequenceType9549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_SequenceType9598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9609: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONCAT_in_p_StringConcatExpr3817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RangeExpr_in_p_StringConcatExpr3821: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_FOR_in_p_ForClause3848: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3852: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ForClause3855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_ForBinding_in_p_ForClause3857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_ForBinding3887: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_ForBinding3891: new org.antlr.runtime.BitSet([0x00280000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_TypeDeclaration_in_p_ForBinding3895: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00010000,0x00000000, 0x02000000]),
+    FOLLOW_p_AllowingEmpty_in_p_ForBinding3898: new org.antlr.runtime.BitSet([0x00200000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_PositionalVar_in_p_ForBinding3901: new org.antlr.runtime.BitSet([0x00000000, 0x20000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_p_FTScoreVar_in_p_ForBinding3904: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_ForBinding3909: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ForBinding3913: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALLOWING_in_p_AllowingEmpty3942: new org.antlr.runtime.BitSet([0x00000000, 0x00001000]),
+    FOLLOW_EMPTY_in_p_AllowingEmpty3948: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_PositionalVar3978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_PositionalVar3984: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_PositionalVar3988: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LET_in_p_LetClause4018: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_LetClause4025: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000,0x80000000, 0x00000000]),
+    FOLLOW_p_LetBinding_in_p_LetClause4027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_LetBinding4061: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_LetBinding4065: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_TypeDeclaration_in_p_LetBinding4069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_p_FTScoreVar_in_p_LetBinding4075: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_LetBinding4079: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_LetBinding4081: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOR_in_p_WindowClause4110: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
+    FOLLOW_p_TumblingWindowClause_in_p_WindowClause4115: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SlidingWindowClause_in_p_WindowClause4119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TUMBLING_in_p_TumblingWindowClause4156: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_TumblingWindowClause4162: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TumblingWindowClause4168: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TumblingWindowClause4172: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_TumblingWindowClause4176: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_TumblingWindowClause4181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TumblingWindowClause4185: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_TumblingWindowClause4188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_TumblingWindowClause4190: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLIDING_in_p_SlidingWindowClause4219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_WINDOW_in_p_SlidingWindowClause4225: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_SlidingWindowClause4231: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_SlidingWindowClause4235: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_SlidingWindowClause4239: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_SlidingWindowClause4244: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SlidingWindowClause4248: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_WindowStartCondition_in_p_SlidingWindowClause4251: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x80800000]),
+    FOLLOW_p_WindowEndCondition_in_p_SlidingWindowClause4253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_START_in_p_WindowStartCondition4282: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowStartCondition4286: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowStartCondition4290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowStartCondition4294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ONLY_in_p_WindowEndCondition4324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_WindowEndCondition4332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x40000000,0x00000408, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_WindowVars_in_p_WindowEndCondition4336: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000400, 0x00000000]),
+    FOLLOW_WHEN_in_p_WindowEndCondition4340: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WindowEndCondition4344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4374: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CurrentItem_in_p_WindowVars4378: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_p_PositionalVar_in_p_WindowVars4384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000,0x00000008, 0x00000000]),
+    FOLLOW_PREVIOUS_in_p_WindowVars4390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4394: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PreviousItem_in_p_WindowVars4396: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_NEXT_in_p_WindowVars4403: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_WindowVars4407: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NextItem_in_p_WindowVars4409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_CurrentItem4437: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_PreviousItem4463: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NextItem4489: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COUNT_in_p_CountClause4517: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CountClause4523: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CountClause4527: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHERE_in_p_WhereClause4565: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_WhereClause4569: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GROUP_in_p_GroupByClause4598: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_GroupByClause4604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpecList_in_p_GroupByClause4608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4634: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_GroupingSpecList4637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_p_GroupingSpec_in_p_GroupingSpecList4639: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_DOLLAR_in_p_GroupingSpec4669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_GroupingSpec4673: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_GroupingSpec4680: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_GroupingSpec4684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4716: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4720: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_STABLE_in_p_OrderByClause4728: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00040000, 0x00000000]),
+    FOLLOW_ORDER_in_p_OrderByClause4732: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_OrderByClause4736: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpecList_in_p_OrderByClause4742: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4768: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_OrderSpecList4771: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_OrderSpec_in_p_OrderSpecList4773: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_ExprSingle_in_p_OrderSpec4801: new org.antlr.runtime.BitSet([0x40100000, 0x00001040]),
+    FOLLOW_p_OrderModifier_in_p_OrderSpec4804: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ASCENDING_in_p_OrderModifier4833: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_DESCENDING_in_p_OrderModifier4839: new org.antlr.runtime.BitSet([0x40000002, 0x00001000]),
+    FOLLOW_EMPTY_in_p_OrderModifier4846: new org.antlr.runtime.BitSet([0x00000000, 0x01000000,0x00000020, 0x00000000]),
+    FOLLOW_GREATEST_in_p_OrderModifier4851: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_LEAST_in_p_OrderModifier4857: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_OrderModifier4865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_OrderModifier4867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnHybrid4900: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnHybrid4904: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SOME_in_p_QuantifiedExpr4934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_EVERY_in_p_QuantifiedExpr4940: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4947: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_QuantifiedExpr4951: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4955: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4964: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_QuantifiedExpr4968: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_QuantifiedExpr4972: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_QuantifiedExpr4976: new org.antlr.runtime.BitSet([0x00080000, 0x20000000]),
+    FOLLOW_p_TypeDeclaration_in_p_QuantifiedExpr4980: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_QuantifiedExpr4985: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr4989: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x08000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_SATISFIES_in_p_QuantifiedExpr4996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_QuantifiedExpr5000: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchHybrid5030: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchHybrid5034: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchHybrid5036: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchHybrid5039: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseHybrid_in_p_SwitchHybrid5041: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchHybrid5047: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchHybrid5053: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchHybrid5057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseHybrid5088: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseHybrid5092: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseHybrid5098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseHybrid5102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SwitchCaseOperand5129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchHybrid5159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchHybrid5163: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchHybrid5165: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchHybrid5168: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseHybrid_in_p_TypeswitchHybrid5170: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchHybrid5176: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchHybrid5183: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchHybrid5187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchHybrid5195: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchHybrid5199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseHybrid5229: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseHybrid5236: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseHybrid5240: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseHybrid5246: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceTypeUnion_in_p_CaseHybrid5252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseHybrid5256: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_CaseHybrid5260: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_SequenceTypeUnion5290: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_SequenceTypeUnion5292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_IF_in_p_IfHybrid5323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfHybrid5327: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfHybrid5329: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfHybrid5332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfHybrid5336: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5340: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfHybrid5345: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfHybrid5349: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TryClause_in_p_TryCatchExpr5376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_p_CatchClause_in_p_TryCatchExpr5378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryClause5407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_TryClause5411: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TryTargetExpr_in_p_TryClause5413: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_TryClause5415: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TryTargetExpr5441: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CATCH_in_p_CatchClause5470: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_CatchClause5474: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CatchClause5476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CatchClause5478: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CatchClause5481: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5507: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_VBAR_in_p_CatchErrorList5510: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_CatchErrorList5512: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_OR_in_p_OrExpr5563: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AndExpr_in_p_OrExpr5567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5596: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_AND_in_p_AndExpr5602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ComparisonExpr_in_p_AndExpr5606: new org.antlr.runtime.BitSet([0x00040002, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5636: new org.antlr.runtime.BitSet([0x00000002, 0x02808000,0x00000892, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x001F8050]),
+    FOLLOW_p_ValueComp_in_p_ComparisonExpr5641: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_GeneralComp_in_p_ComparisonExpr5645: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeComp_in_p_ComparisonExpr5649: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_FTContainsExpr_in_p_ComparisonExpr5652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5681: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_RangeExpr5687: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_RangeExpr5691: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5720: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_PLUS_in_p_AdditiveExpr5727: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_AdditiveExpr5735: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_MultiplicativeExpr_in_p_AdditiveExpr5740: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00006000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5769: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_MultiplicativeExpr5776: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DIV_in_p_MultiplicativeExpr5785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_IDIV_in_p_MultiplicativeExpr5791: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MOD_in_p_MultiplicativeExpr5797: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_MultiplicativeExpr5803: new org.antlr.runtime.BitSet([0x00000002, 0x04000080,0x00000100, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5832: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_UNION_in_p_UnionExpr5839: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_VBAR_in_p_UnionExpr5845: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IntersectExceptExpr_in_p_UnionExpr5848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000200,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5877: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_INTERSECT_in_p_IntersectExceptExpr5884: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_IntersectExceptExpr5890: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InstanceofExpr_in_p_IntersectExceptExpr5895: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000001, 0x00000000]),
+    FOLLOW_p_TreatExpr_in_p_InstanceofExpr5924: new org.antlr.runtime.BitSet([0x00000002, 0x80000000]),
+    FOLLOW_INSTANCE_in_p_InstanceofExpr5930: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_InstanceofExpr5936: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_InstanceofExpr5940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastableExpr_in_p_TreatExpr5968: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_TREAT_in_p_TreatExpr5974: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TreatExpr5980: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TreatExpr5984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CastExpr_in_p_CastableExpr6021: new org.antlr.runtime.BitSet([0x10000002, 0x00000000]),
+    FOLLOW_CASTABLE_in_p_CastableExpr6027: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastableExpr6033: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastableExpr6037: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnaryExpr_in_p_CastExpr6074: new org.antlr.runtime.BitSet([0x08000002, 0x00000000]),
+    FOLLOW_CAST_in_p_CastExpr6080: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CastExpr6086: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SingleType_in_p_CastExpr6090: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PLUS_in_p_UnaryExpr6122: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_MINUS_in_p_UnaryExpr6130: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ValueExpr_in_p_UnaryExpr6135: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ValidateExpr_in_p_ValueExpr6205: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ValueExpr6217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExtensionExpr_in_p_ValueExpr6229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQUAL_in_p_GeneralComp6258: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NOTEQUAL_in_p_GeneralComp6264: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_GeneralComp6270: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLEREQ_in_p_GeneralComp6276: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_GeneralComp6282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATEREQ_in_p_GeneralComp6288: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EQ_in_p_ValueComp6320: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NE_in_p_ValueComp6326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LT_in_p_ValueComp6332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LE_in_p_ValueComp6338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GT_in_p_ValueComp6344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GE_in_p_ValueComp6350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IS_in_p_NodeComp6381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_SMALLER_in_p_NodeComp6387: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_GREATER_in_p_NodeComp6391: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_VALIDATE_in_p_ValidateExpr6419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_ValidationMode_in_p_ValidateExpr6425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_TYPE_in_p_ValidateExpr6431: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ValidateExpr6435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_ValidateExpr6440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ValidateExpr6442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ValidateExpr6445: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LAX_in_p_ValidationMode6474: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STRICT_in_p_ValidationMode6480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_ExtensionExpr6509: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_ExtensionExpr6512: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ExtensionExpr6514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_ExtensionExpr6518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6563: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_p_PathExpr6576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_SLASH_in_p_PathExpr6588: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6590: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_p_PathExpr6602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6630: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_set_in_p_RelativePathExpr6633: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StepExpr_in_p_RelativePathExpr6641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00600000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6695: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6809: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6827: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6848: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PostfixExpr_in_p_StepExpr6866: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AxisStep_in_p_StepExpr6878: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseStep_in_p_AxisStep6905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_ForwardStep_in_p_AxisStep6909: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_PredicateList_in_p_AxisStep6912: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ForwardAxis_in_p_ForwardStep6938: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ForwardStep6940: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevForwardStep_in_p_ForwardStep6952: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CHILD_in_p_ForwardAxis6978: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6980: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_in_p_ForwardAxis6992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis6994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_ForwardAxis7006: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SELF_in_p_ForwardAxis7020: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7022: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DESCENDANT_OR_SELF_in_p_ForwardAxis7034: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7036: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_SIBLING_in_p_ForwardAxis7048: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7050: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOLLOWING_in_p_ForwardAxis7062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ForwardAxis7064: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTR_SIGN_in_p_AbbrevForwardStep7090: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_AbbrevForwardStep7093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReverseAxis_in_p_ReverseStep7119: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001000,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NodeTest_in_p_ReverseStep7121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AbbrevReverseStep_in_p_ReverseStep7133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARENT_in_p_ReverseAxis7159: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_in_p_ReverseAxis7173: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7175: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_SIBLING_in_p_ReverseAxis7187: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PRECEDING_in_p_ReverseAxis7201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7203: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANCESTOR_OR_SELF_in_p_ReverseAxis7215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_COLON_COLON_in_p_ReverseAxis7217: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_DOT_in_p_AbbrevReverseStep7243: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_NodeTest7269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NameTest_in_p_NodeTest7273: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_p_NameTest7305: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7326: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_NameTest7344: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_Wildcard7374: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7379: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Wildcard7393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7395: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7397: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Wildcard7409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_p_Wildcard7411: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_Wildcard7413: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_p_PostfixExpr7451: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_p_Predicate_in_p_PostfixExpr7454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LPAREN_in_p_ArgumentList7495: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7498: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ArgumentList7501: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F801,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Argument_in_p_ArgumentList7503: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_ArgumentList7509: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Predicate_in_p_PredicateList7535: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000004]),
+    FOLLOW_LSQUARE_in_p_Predicate7562: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_Predicate7564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000008]),
+    FOLLOW_RSQUARE_in_p_Predicate7567: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedExpr_in_p_PrimaryExpr7600: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Literal_in_p_PrimaryExpr7612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarRef_in_p_PrimaryExpr7624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContextItemExpr_in_p_PrimaryExpr7636: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FunctionCall_in_p_PrimaryExpr7648: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrderedExpr_in_p_PrimaryExpr7660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_UnorderedExpr_in_p_PrimaryExpr7672: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Constructor_in_p_PrimaryExpr7684: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BlockExpr_in_p_PrimaryExpr7698: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NumericLiteral_in_p_Literal7724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_Literal7728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_NumericLiteral7756: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DecimalLiteral_in_p_NumericLiteral7764: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DoubleLiteral_in_p_NumericLiteral7772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarRef7810: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarRef7814: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_VarName7842: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedExpr7868: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xEFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_ParenthesizedExpr7870: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedExpr7874: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOT_in_p_ContextItemExpr7900: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_OrderedExpr7928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_OrderedExpr7932: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_OrderedExpr7934: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_OrderedExpr7937: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNORDERED_in_p_UnorderedExpr7965: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_UnorderedExpr7969: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_UnorderedExpr7971: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_UnorderedExpr7974: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_FQName_in_p_FunctionCall8003: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_ArgumentList_in_p_FunctionCall8008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_Argument8034: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ArgumentPlaceholder_in_p_Argument8039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUESTION_in_p_ArgumentPlaceholder8065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_p_Constructor8091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ComputedConstructor_in_p_Constructor8103: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirElemConstructor_in_p_DirectConstructor8129: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirCommentConstructor_in_p_DirectConstructor8141: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirPIConstructor_in_p_DirectConstructor8153: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SMALLER_in_p_DirElemConstructor8180: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000,0x00020000, 0x00000000]),
+    FOLLOW_p_DirAttributeList_in_p_DirElemConstructor8201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08010000]),
+    FOLLOW_EMPTY_CLOSE_TAG_in_p_DirElemConstructor8215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8220: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_pm_DirElemContent_in_p_DirElemConstructor8222: new org.antlr.runtime.BitSet([0x00000FC0, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10008001,0x00300000, 0x00000000]),
+    FOLLOW_CLOSE_TAG_in_p_DirElemConstructor8225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirElemConstructor8229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirElemConstructor8233: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_GREATER_in_p_DirElemConstructor8236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8313: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00021000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_DirAttributeList8318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010,0x00020000, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_EQUAL_in_p_DirAttributeList8325: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_S_in_p_DirAttributeList8327: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020300, 0x00000000]),
+    FOLLOW_p_DirAttributeValue_in_p_DirAttributeList8332: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00020000, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8366: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_QUOT_in_p_DirAttributeValue8373: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8379: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_QuotAttrValueContent_in_p_DirAttributeValue8383: new org.antlr.runtime.BitSet([0x00002F10, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8389: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8434: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_ESCAPE_APOS_in_p_DirAttributeValue8441: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_QUOT_in_p_DirAttributeValue8447: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_p_AposAttrValueContent_in_p_DirAttributeValue8451: new org.antlr.runtime.BitSet([0x00001F20, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00000300, 0x00000000]),
+    FOLLOW_APOS_in_p_DirAttributeValue8457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuotAttrContentChar_in_p_QuotAttrValueContent8515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_QuotAttrValueContent8521: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AposAttrContentChar_in_p_AposAttrValueContent8549: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_p_AposAttrValueContent8555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DirectConstructor_in_pm_DirElemContent8581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CDataSection_in_pm_DirElemContent8593: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CommonContent_in_pm_DirElemContent8605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementContentChar_in_pm_DirElemContent8617: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_PredefinedEntityRef_in_pm_CommonContent8645: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CharRef_in_pm_CommonContent8657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_LBRACKET_in_pm_CommonContent8671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ESCAPE_RBRACKET_in_pm_CommonContent8687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_EnclosedExprXml_in_pm_CommonContent8701: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_pg_EnclosedExprXml8733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pg_EnclosedExprXml8749: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pg_EnclosedExprXml8763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirCommentConstructor_in_p_DirCommentConstructor8794: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_DirPIConstructor_in_p_DirPIConstructor8830: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_CDataSection_in_p_CDataSection8865: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompDocConstructor_in_p_ComputedConstructor8897: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompElemConstructor_in_p_ComputedConstructor8909: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompAttrConstructor_in_p_ComputedConstructor8921: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompNamespaceConstructor_in_p_ComputedConstructor8933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompTextConstructor_in_p_ComputedConstructor8945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompCommentConstructor_in_p_ComputedConstructor8957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pm_CompPIConstructor_in_p_ComputedConstructor8969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CompBinaryConstructor_in_p_ComputedConstructor8984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_in_pm_CompDocConstructor9013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompDocConstructor9017: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompDocConstructor9019: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompDocConstructor9021: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_pm_CompElemConstructor9057: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompElemConstructor9062: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9067: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompElemConstructor9069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9072: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompElemConstructor9076: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_pm_ContentExpr_in_pm_CompElemConstructor9078: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompElemConstructor9080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_ContentExpr9107: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_pm_CompAttrConstructor9136: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_pm_CompAttrConstructor9141: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompAttrConstructor9148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9151: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompAttrConstructor9155: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompAttrConstructor9157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompAttrConstructor9159: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_in_p_CompNamespaceConstructor9187: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Prefix_in_p_CompNamespaceConstructor9192: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9197: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PrefixExpr_in_p_CompNamespaceConstructor9199: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9201: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompNamespaceConstructor9205: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F003,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_URIExpr_in_p_CompNamespaceConstructor9207: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompNamespaceConstructor9210: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_Prefix9236: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_PrefixExpr9262: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_URIExpr9289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_CompTextConstructor9318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompTextConstructor9322: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompTextConstructor9324: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompTextConstructor9327: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_CompBinaryConstructor9355: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_CompBinaryConstructor9359: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_CompBinaryConstructor9361: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_CompBinaryConstructor9364: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_pm_CompCommentConstructor9393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompCommentConstructor9397: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompCommentConstructor9399: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompCommentConstructor9401: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_pm_CompPIConstructor9430: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pm_CompPIConstructor9435: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9440: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_pm_CompPIConstructor9442: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_pm_CompPIConstructor9449: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_pm_CompPIConstructor9451: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_pm_CompPIConstructor9453: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_SingleType9497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_SingleType9499: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_TypeDeclaration9528: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypeDeclaration9534: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EMPTY_SEQUENCE_in_p_SequenceType9587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SequenceType9593: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SequenceType9597: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_SequenceType9646: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_SequenceType9657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_OccurrenceIndicator0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_p_ItemType9711: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BINARY_in_p_ItemType9751: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9753: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9755: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ITEM_in_p_ItemType9797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicOrUnionType9883: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DocumentTest_in_p_KindTest9933: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_KindTest9945: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeTest_in_p_KindTest9957: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_KindTest9969: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_SchemaAttributeTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PITest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_CommentTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TextTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AnyKindTest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_AnyKindTest10067: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyKindTest10069: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyKindTest10071: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10097: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_DocumentTest10099: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_ElementTest_in_p_DocumentTest10102: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10106: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_DocumentTest10110: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TEXT_in_p_TextTest10136: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TextTest10138: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TextTest10140: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COMMENT_in_p_CommentTest10166: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_CommentTest10168: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_CommentTest10170: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_NamespaceNodeTest10198: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_NamespaceNodeTest10200: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10226: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_PITest10228: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_p_PITest10231: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_PITest10235: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_PITest10239: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ATTRIBUTE_in_p_AttributeTest10265: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AttributeTest10267: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10270: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_AttributeTest10273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_AttributeTest10275: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AttributeTest10281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10309: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_AttribNameOrWildcard10313: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10339: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaAttributeTest10341: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10343: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaAttributeTest10345: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10371: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ELEMENT_in_p_ElementTest10397: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ElementTest10399: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10402: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_ElementTest10405: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TypeName_in_p_ElementTest10407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
-    FOLLOW_QUESTION_in_p_ElementTest10409: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ElementTest10416: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementNameOrWildcard10442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STAR_in_p_ElementNameOrWildcard10446: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10464: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SchemaElementTest10466: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10468: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SchemaElementTest10470: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ElementName_in_p_ElementDeclaration10496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AttributeName10522: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_ElementName10548: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_TypeName10574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_FunctionTest10600: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10604: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10608: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_AnyFunctionTest10635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_AnyFunctionTest10637: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_STAR_in_p_AnyFunctionTest10639: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_AnyFunctionTest10641: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FUNCTION_in_p_TypedFunctionTest10667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypedFunctionTest10669: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TypedFunctionTest10675: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_TypedFunctionTest10683: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_TypedFunctionTest10685: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_ParenthesizedItemType10713: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_ParenthesizedItemType10717: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10768: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10772: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
-    FOLLOW_QUOT_in_p_StringLiteral10774: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10813: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10817: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
-    FOLLOW_APOS_in_p_StringLiteral10819: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_pg_QuotStringLiteralContent10885: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_set_in_pg_AposStringLiteralContent10936: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
-    FOLLOW_L_ElementContentChar_in_p_ElementContentChar10994: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11070: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_p_QName11156: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_p_QName11168: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_QName_in_pg_FQName11229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FNCName_in_pg_FQName11241: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11285: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_pg_QName11287: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_pg_QName11291: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_p_ItemType9759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BINARY_in_p_ItemType9799: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9801: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9803: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ITEM_in_p_ItemType9845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ItemType9847: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ItemType9849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AtomicOrUnionType_in_p_ItemType9893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ParenthesizedItemType_in_p_ItemType9905: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicOrUnionType9931: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DocumentTest_in_p_KindTest9981: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_KindTest9993: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeTest_in_p_KindTest10005: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_KindTest10017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_SchemaAttributeTest_in_p_KindTest10029: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PITest_in_p_KindTest10041: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_CommentTest_in_p_KindTest10053: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TextTest_in_p_KindTest10065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NamespaceNodeTest_in_p_KindTest10077: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AnyKindTest_in_p_KindTest10089: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_AnyKindTest10115: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyKindTest10117: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyKindTest10119: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOCUMENT_NODE_in_p_DocumentTest10145: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_DocumentTest10147: new org.antlr.runtime.BitSet([0x00000000, 0x00000400,0x40000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_ElementTest_in_p_DocumentTest10150: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_SchemaElementTest_in_p_DocumentTest10154: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_DocumentTest10158: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TEXT_in_p_TextTest10184: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TextTest10186: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TextTest10188: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COMMENT_in_p_CommentTest10214: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_CommentTest10216: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_CommentTest10218: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NAMESPACE_NODE_in_p_NamespaceNodeTest10244: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_NamespaceNodeTest10246: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_NamespaceNodeTest10248: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PROCESSING_INSTRUCTION_in_p_PITest10274: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_PITest10276: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00000000,0x01C01300, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_p_PITest10279: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_PITest10283: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_PITest10287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ATTRIBUTE_in_p_AttributeTest10313: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AttributeTest10315: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttribNameOrWildcard_in_p_AttributeTest10318: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_AttributeTest10321: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_AttributeTest10323: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AttributeTest10329: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttribNameOrWildcard10357: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_AttribNameOrWildcard10361: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ATTRIBUTE_in_p_SchemaAttributeTest10387: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaAttributeTest10389: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AttributeDeclaration_in_p_SchemaAttributeTest10391: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaAttributeTest10393: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AttributeName_in_p_AttributeDeclaration10419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ELEMENT_in_p_ElementTest10445: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ElementTest10447: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x4FFFFFFF, 0x00001000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementNameOrWildcard_in_p_ElementTest10450: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_ElementTest10453: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TypeName_in_p_ElementTest10455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000800]),
+    FOLLOW_QUESTION_in_p_ElementTest10457: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ElementTest10464: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementNameOrWildcard10490: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STAR_in_p_ElementNameOrWildcard10494: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCHEMA_ELEMENT_in_p_SchemaElementTest10512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SchemaElementTest10514: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ElementDeclaration_in_p_SchemaElementTest10516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SchemaElementTest10518: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ElementName_in_p_ElementDeclaration10544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AttributeName10570: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_ElementName10596: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_TypeName10622: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_FunctionTest10648: new org.antlr.runtime.BitSet([0x00000000, 0x00400000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_AnyFunctionTest_in_p_FunctionTest10652: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TypedFunctionTest_in_p_FunctionTest10656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_AnyFunctionTest10683: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_AnyFunctionTest10685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_STAR_in_p_AnyFunctionTest10687: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_AnyFunctionTest10689: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FUNCTION_in_p_TypedFunctionTest10715: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypedFunctionTest10717: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x6FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TypedFunctionTest10723: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_TypedFunctionTest10731: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_TypedFunctionTest10733: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_TypedFunctionTest10735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_ParenthesizedItemType10761: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ItemType_in_p_ParenthesizedItemType10763: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_ParenthesizedItemType10765: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10816: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_QuotStringLiteralContent_in_p_StringLiteral10820: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000200, 0x00000000]),
+    FOLLOW_QUOT_in_p_StringLiteral10822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10861: new org.antlr.runtime.BitSet([0xFFFFFFF0, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFFFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_pg_AposStringLiteralContent_in_p_StringLiteral10865: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000100, 0x00000000]),
+    FOLLOW_APOS_in_p_StringLiteral10867: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_pg_QuotStringLiteralContent10933: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFDFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_set_in_pg_AposStringLiteralContent10984: new org.antlr.runtime.BitSet([0xFFFFFFF2, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFDFF,0xFFFFFEFF, 0xFFFFFFFF,0x001FFFFF, 0x00000000]),
+    FOLLOW_L_ElementContentChar_in_p_ElementContentChar11042: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_QuotAttrContentChar_in_p_QuotAttrContentChar11068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_AposAttrContentChar_in_p_AposAttrContentChar11118: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_p_QName11204: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_p_QName11216: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_QName_in_pg_FQName11277: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FNCName_in_pg_FQName11289: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11333: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_pg_QName11335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_pg_QName11339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_NCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_p_FNCName0: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13282: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13306: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_RevalidationDecl13358: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
-    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13362: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
-    FOLLOW_STRICT_in_pm_RevalidationDecl13367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_LAX_in_pm_RevalidationDecl13373: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SKIP_in_pm_RevalidationDecl13379: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13384: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_InsertExprTargetChoice13414: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
-    FOLLOW_FIRST_in_p_InsertExprTargetChoice13419: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_LAST_in_p_InsertExprTargetChoice13425: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
-    FOLLOW_INTO_in_p_InsertExprTargetChoice13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AFTER_in_p_InsertExprTargetChoice13449: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13465: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INSERT_in_p_InsertExpr13495: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_InsertExpr13500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_InsertExpr13506: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SourceExpr_in_p_InsertExpr13509: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
-    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13511: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_InsertExpr13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DELETE_in_p_DeleteExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODE_in_p_DeleteExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_NODES_in_p_DeleteExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_DeleteExpr13557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_REPLACE_in_p_ReplaceExpr13587: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
-    FOLLOW_VALUE_in_p_ReplaceExpr13592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_OF_in_p_ReplaceExpr13596: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ReplaceExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_WITH_in_p_ReplaceExpr13609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RENAME_in_p_RenameExpr13642: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_RenameExpr13646: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_TargetExpr_in_p_RenameExpr13648: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_RenameExpr13652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NewNameExpr_in_p_RenameExpr13654: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_SourceExpr13682: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TargetExpr13709: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_NewNameExpr13736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COPY_in_p_TransformExpr13765: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13769: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13773: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13777: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13779: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_TransformExpr13783: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TransformExpr13787: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TransformExpr13791: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_TransformExpr13795: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_MODIFY_in_p_TransformExpr13804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13806: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TransformExpr13811: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DECLARE_in_pm_FTOptionDecl13851: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
-    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13855: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13857: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13859: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SCORE_in_p_FTScoreVar13889: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_FTScoreVar13895: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_FTScoreVar13899: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13927: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_CONTAINS_in_p_FTContainsExpr13933: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
-    FOLLOW_TEXT_in_p_FTContainsExpr13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTContainsExpr13941: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13943: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOr_in_p_FTSelection13973: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_p_FTPosFilter_in_p_FTSelection13975: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
-    FOLLOW_WEIGHT_in_p_FTWeight14004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_p_FTWeight14008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWeight14010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWeight14013: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14039: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_FTOR_in_p_FTOr14045: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTAnd_in_p_FTOr14049: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_FTAND_in_p_FTAnd14084: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTMildNot_in_p_FTAnd14088: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14117: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_NOT_in_p_FTMildNot14123: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
-    FOLLOW_IN_in_p_FTMildNot14127: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14131: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
-    FOLLOW_FTNOT_in_p_FTUnaryNot14164: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14171: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
-    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14199: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
-    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14202: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWords_in_p_FTPrimary14233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
-    FOLLOW_p_FTTimes_in_p_FTPrimary14235: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTPrimary14250: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTPrimary14252: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_FTPrimary14254: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14267: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWordsValue_in_p_FTWords14293: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
-    FOLLOW_p_FTAnyallOption_in_p_FTWords14295: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTWordsValue14322: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTWordsValue14335: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_FTWordsValue14337: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTWordsValue14340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_L_Pragma_in_p_FTExtensionSelection14367: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_FTExtensionSelection14370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
-    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14372: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_FTExtensionSelection14375: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ANY_in_p_FTAnyallOption14406: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
-    FOLLOW_WORD_in_p_FTAnyallOption14410: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ALL_in_p_FTAnyallOption14419: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTAnyallOption14421: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PHRASE_in_p_FTAnyallOption14429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OCCURS_in_p_FTTimes14461: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTTimes14463: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
-    FOLLOW_TIMES_in_p_FTTimes14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTRange14500: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14520: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTRange14524: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14526: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTRange14544: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_InsertExpr_in_pg_UpdateExpr13330: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_DeleteExpr_in_pg_UpdateExpr13342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_RenameExpr_in_pg_UpdateExpr13354: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ReplaceExpr_in_pg_UpdateExpr13366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_TransformExpr_in_pg_UpdateExpr13378: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_RevalidationDecl13406: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x02000000, 0x00000000]),
+    FOLLOW_REVALIDATION_in_pm_RevalidationDecl13410: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000008, 0x00000004,0x04000000, 0x00000000]),
+    FOLLOW_STRICT_in_pm_RevalidationDecl13415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_LAX_in_pm_RevalidationDecl13421: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SKIP_in_pm_RevalidationDecl13427: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_RevalidationDecl13432: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_InsertExprTargetChoice13462: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00120000, 0x00000000]),
+    FOLLOW_FIRST_in_p_InsertExprTargetChoice13467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_LAST_in_p_InsertExprTargetChoice13473: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00080000, 0x00000000]),
+    FOLLOW_INTO_in_p_InsertExprTargetChoice13480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AFTER_in_p_InsertExprTargetChoice13497: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BEFORE_in_p_InsertExprTargetChoice13513: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INSERT_in_p_InsertExpr13543: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_InsertExpr13548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_InsertExpr13554: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SourceExpr_in_p_InsertExpr13557: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00086000, 0x00000000]),
+    FOLLOW_p_InsertExprTargetChoice_in_p_InsertExpr13559: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_InsertExpr13561: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DELETE_in_p_DeleteExpr13591: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODE_in_p_DeleteExpr13596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_NODES_in_p_DeleteExpr13602: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_DeleteExpr13605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_REPLACE_in_p_ReplaceExpr13635: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x10000000, 0x00000000]),
+    FOLLOW_VALUE_in_p_ReplaceExpr13640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_OF_in_p_ReplaceExpr13644: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ReplaceExpr13650: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13652: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_WITH_in_p_ReplaceExpr13657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ReplaceExpr13659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RENAME_in_p_RenameExpr13690: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_RenameExpr13694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_TargetExpr_in_p_RenameExpr13696: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_RenameExpr13700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NewNameExpr_in_p_RenameExpr13702: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_SourceExpr13730: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TargetExpr13757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_NewNameExpr13784: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COPY_in_p_TransformExpr13813: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13825: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13827: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_TransformExpr13831: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TransformExpr13835: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TransformExpr13839: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_TransformExpr13843: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_MODIFY_in_p_TransformExpr13852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13854: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TransformExpr13859: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_TransformExpr13861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DECLARE_in_pm_FTOptionDecl13899: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000100]),
+    FOLLOW_FT_OPTION_in_pm_FTOptionDecl13903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_pm_FTOptionDecl13905: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_pm_FTOptionDecl13907: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SCORE_in_p_FTScoreVar13937: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_FTScoreVar13943: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_FTScoreVar13947: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringConcatExpr_in_p_FTContainsExpr13975: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_CONTAINS_in_p_FTContainsExpr13981: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000010]),
+    FOLLOW_TEXT_in_p_FTContainsExpr13985: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTContainsExpr13989: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_p_FTIgnoreOption_in_p_FTContainsExpr13991: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOr_in_p_FTSelection14021: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_p_FTPosFilter_in_p_FTSelection14023: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00080000, 0x00000000,0x00000800, 0x01000038]),
+    FOLLOW_WEIGHT_in_p_FTWeight14052: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_p_FTWeight14056: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWeight14058: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWeight14061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14087: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_FTOR_in_p_FTOr14093: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTAnd_in_p_FTOr14097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000800]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14126: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_FTAND_in_p_FTAnd14132: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTMildNot_in_p_FTAnd14136: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14165: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_NOT_in_p_FTMildNot14171: new org.antlr.runtime.BitSet([0x00000000, 0x20000000]),
+    FOLLOW_IN_in_p_FTMildNot14175: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTUnaryNot_in_p_FTMildNot14179: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00040000]),
+    FOLLOW_FTNOT_in_p_FTUnaryNot14212: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTPrimaryWithOptions_in_p_FTUnaryNot14219: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTPrimary_in_p_FTPrimaryWithOptions14245: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x0000000C, 0x00000000]),
+    FOLLOW_p_FTMatchOptions_in_p_FTPrimaryWithOptions14247: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000008, 0x00000000]),
+    FOLLOW_p_FTWeight_in_p_FTPrimaryWithOptions14250: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWords_in_p_FTPrimary14281: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00080000]),
+    FOLLOW_p_FTTimes_in_p_FTPrimary14283: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTPrimary14298: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000001,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTPrimary14300: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_FTPrimary14302: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionSelection_in_p_FTPrimary14315: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWordsValue_in_p_FTWords14341: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0xC0000000, 0x00400000]),
+    FOLLOW_p_FTAnyallOption_in_p_FTWords14343: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTWordsValue14370: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTWordsValue14383: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_FTWordsValue14385: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTWordsValue14388: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_L_Pragma_in_p_FTExtensionSelection14415: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001,0x00080000, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_FTExtensionSelection14418: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400,0x20000000, 0x00000003,0x01C80300, 0x00000000]),
+    FOLLOW_p_FTSelection_in_p_FTExtensionSelection14420: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_FTExtensionSelection14423: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ANY_in_p_FTAnyallOption14454: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000040, 0x00000000]),
+    FOLLOW_WORD_in_p_FTAnyallOption14458: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ALL_in_p_FTAnyallOption14467: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTAnyallOption14469: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PHRASE_in_p_FTAnyallOption14477: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OCCURS_in_p_FTTimes14509: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTTimes14511: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000001, 0x00000000]),
+    FOLLOW_TIMES_in_p_FTTimes14515: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTRange14548: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
     FOLLOW_p_AdditiveExpr_in_p_FTRange14550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTRange14568: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTRange14574: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTRange14576: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTOrder_in_p_FTPosFilter14607: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWindow_in_p_FTPosFilter14611: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDistance_in_p_FTPosFilter14615: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTScope_in_p_FTPosFilter14619: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTContent_in_p_FTPosFilter14623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ORDERED_in_p_FTOrder14651: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WINDOW_in_p_FTWindow14681: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AdditiveExpr_in_p_FTWindow14685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTWindow14687: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DISTANCE_in_p_FTDistance14715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTRange_in_p_FTDistance14719: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
-    FOLLOW_p_FTUnit_in_p_FTDistance14721: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTUnit14751: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCES_in_p_FTUnit14757: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPHS_in_p_FTUnit14763: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SAME_in_p_FTScope14796: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_DIFFERENT_in_p_FTScope14802: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
-    FOLLOW_p_FTBigUnit_in_p_FTScope14807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SENTENCE_in_p_FTBigUnit14837: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_PARAGRAPH_in_p_FTBigUnit14843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14878: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_START_in_p_FTContent14882: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTContent14890: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
-    FOLLOW_END_in_p_FTContent14894: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ENTIRE_in_p_FTContent14902: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTContent14906: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_USING_in_p_FTMatchOptions14940: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
-    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14944: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
-    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption14972: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption14984: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption14996: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStemOption_in_p_FTMatchOption15008: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15087: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTCaseOption15091: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_FTCaseOption15109: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTCaseOption15113: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LOWERCASE_in_p_FTCaseOption15130: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UPPERCASE_in_p_FTCaseOption15146: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15181: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
-    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15203: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
-    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15207: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTStemOption15249: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_STEMMING_in_p_FTStemOption15253: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15289: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15292: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15298: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15317: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTThesaurusOption15319: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15322: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_DEFAULT_in_p_FTThesaurusOption15328: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTThesaurusOption15332: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
-    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15334: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTThesaurusOption15338: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTThesaurusOption15356: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
-    FOLLOW_THESAURUS_in_p_FTThesaurusOption15360: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTThesaurusID15393: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15395: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
-    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15402: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
-    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15407: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
-    FOLLOW_LEVELS_in_p_FTThesaurusID15411: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXACTLY_in_p_FTLiteralRange15446: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15448: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15466: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
-    FOLLOW_LEAST_in_p_FTLiteralRange15470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15472: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTLiteralRange15490: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
-    FOLLOW_MOST_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14568: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTRange14572: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14574: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTRange14592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTRange14596: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14598: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTRange14616: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14618: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTRange14622: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTRange14624: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTOrder_in_p_FTPosFilter14655: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWindow_in_p_FTPosFilter14659: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDistance_in_p_FTPosFilter14663: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTScope_in_p_FTPosFilter14667: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTContent_in_p_FTPosFilter14671: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ORDERED_in_p_FTOrder14699: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WINDOW_in_p_FTWindow14729: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AdditiveExpr_in_p_FTWindow14733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTWindow14735: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DISTANCE_in_p_FTDistance14763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTRange_in_p_FTDistance14767: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x10200000,0x00000080, 0x00000000]),
+    FOLLOW_p_FTUnit_in_p_FTDistance14769: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTUnit14799: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCES_in_p_FTUnit14805: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPHS_in_p_FTUnit14811: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SAME_in_p_FTScope14844: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_DIFFERENT_in_p_FTScope14850: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x08100000]),
+    FOLLOW_p_FTBigUnit_in_p_FTScope14855: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SENTENCE_in_p_FTBigUnit14885: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_PARAGRAPH_in_p_FTBigUnit14891: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14926: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_START_in_p_FTContent14930: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTContent14938: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00800000]),
+    FOLLOW_END_in_p_FTContent14942: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ENTIRE_in_p_FTContent14950: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTContent14954: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_USING_in_p_FTMatchOptions14988: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x00010000, 0x00000000,0x00000000, 0xE002A004,0x00000012, 0x00000000]),
+    FOLLOW_p_FTMatchOption_in_p_FTMatchOptions14992: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000004, 0x00000000]),
+    FOLLOW_p_FTLanguageOption_in_p_FTMatchOption15020: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTWildCardOption_in_p_FTMatchOption15032: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTThesaurusOption_in_p_FTMatchOption15044: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStemOption_in_p_FTMatchOption15056: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTCaseOption_in_p_FTMatchOption15068: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTDiacriticsOption_in_p_FTMatchOption15080: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTStopWordOption_in_p_FTMatchOption15092: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_FTExtensionOption_in_p_FTMatchOption15104: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15135: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTCaseOption15139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_FTCaseOption15157: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTCaseOption15161: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LOWERCASE_in_p_FTCaseOption15178: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UPPERCASE_in_p_FTCaseOption15194: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15229: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00001000]),
+    FOLLOW_INSENSITIVE_in_p_FTDiacriticsOption15233: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DIACRITICS_in_p_FTDiacriticsOption15251: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x04000000]),
+    FOLLOW_SENSITIVE_in_p_FTDiacriticsOption15255: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTStemOption15297: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_STEMMING_in_p_FTStemOption15301: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15337: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15340: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15346: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15365: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTThesaurusOption15367: new org.antlr.runtime.BitSet([0x00200000, 0x00000008]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15370: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_DEFAULT_in_p_FTThesaurusOption15376: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTThesaurusOption15380: new org.antlr.runtime.BitSet([0x00200000, 0x00000000]),
+    FOLLOW_p_FTThesaurusID_in_p_FTThesaurusOption15382: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTThesaurusOption15386: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTThesaurusOption15404: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x80000000]),
+    FOLLOW_THESAURUS_in_p_FTThesaurusOption15408: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTThesaurusID15441: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15443: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x008000C0]),
+    FOLLOW_RELATIONSHIP_in_p_FTThesaurusID15448: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTThesaurusID15450: new org.antlr.runtime.BitSet([0x00200002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x000000C0]),
+    FOLLOW_p_FTLiteralRange_in_p_FTThesaurusID15455: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00004000]),
+    FOLLOW_LEVELS_in_p_FTThesaurusID15459: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXACTLY_in_p_FTLiteralRange15494: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15496: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15516: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_TO_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15514: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000020, 0x00000000]),
+    FOLLOW_LEAST_in_p_FTLiteralRange15518: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
     FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15520: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15556: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15560: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15562: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15564: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_STOP_in_p_FTStopWordOption15583: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15587: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_FTStopWordOption15591: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15593: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
-    FOLLOW_NO_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
-    FOLLOW_STOP_in_p_FTStopWordOption15616: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
-    FOLLOW_WORDS_in_p_FTStopWordOption15620: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AT_in_p_FTStopWords15654: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15658: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_p_FTStopWords15672: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15674: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_FTStopWords15677: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTStopWords15679: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
-    FOLLOW_RPAREN_in_p_FTStopWords15683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_UNION_in_p_FTStopWordsInclExcl15715: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15721: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15724: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LANGUAGE_in_p_FTLanguageOption15756: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15760: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NO_in_p_FTWildCardOption15797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
-    FOLLOW_WILDCARDS_in_p_FTWildCardOption15801: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_OPTION_in_p_FTExtensionOption15834: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_FTExtensionOption15838: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15840: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WITHOUT_in_p_FTIgnoreOption15868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_CONTENT_in_p_FTIgnoreOption15872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15908: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_Statements15935: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndExpr15963: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr15990: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_HybridExprSingle_in_p_Hybrid16017: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Statement_in_p_Hybrid16030: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_AssignStatement_in_p_Statement16061: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_BreakStatement_in_p_Statement16073: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ContinueStatement_in_p_Statement16085: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExitStatement_in_p_Statement16097: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_VarDeclStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_WhileStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Expr_in_p_HybridExprSingle16148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_HybridExprSingle16163: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ExprSimple_in_p_ApplyStatement16213: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ApplyStatement16215: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_AssignStatement16243: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_AssignStatement16247: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_BIND_in_p_AssignStatement16251: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_AssignStatement16253: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_AssignStatement16256: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockStatement16282: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockStatement16284: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockStatement16287: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockHybrid16313: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Statements_in_p_BlockHybrid16315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockHybrid16318: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_BREAK_in_p_BreakStatement16346: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_BreakStatement16352: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_BreakStatement16356: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CONTINUE_in_p_ContinueStatement16384: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
-    FOLLOW_LOOP_in_p_ContinueStatement16390: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ContinueStatement16394: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_EXIT_in_p_ExitStatement16422: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
-    FOLLOW_RETURNING_in_p_ExitStatement16428: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ExitStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
-    FOLLOW_SEMICOLON_in_p_ExitStatement16435: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_InitialClause_in_p_FLWORStatement16461: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16463: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
-    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16466: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_RETURN_in_p_ReturnStatement16498: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_ReturnStatement16502: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_IF_in_p_IfStatement16531: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_IfStatement16535: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_IfStatement16537: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_IfStatement16540: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
-    FOLLOW_THEN_in_p_IfStatement16544: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16548: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
-    FOLLOW_ELSE_in_p_IfStatement16553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_IfStatement16557: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SWITCH_in_p_SwitchStatement16586: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_SwitchStatement16590: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_SwitchStatement16592: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_SwitchStatement16595: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16597: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_SwitchStatement16602: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchStatement16608: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchStatement16612: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_SwitchCaseStatement16642: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16646: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_SwitchCaseStatement16652: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16656: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TRY_in_p_TryCatchStatement16685: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16689: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchStatement16694: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16698: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16700: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TRY_in_p_TryCatchHybrid16732: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16736: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_CATCH_in_p_TryCatchHybrid16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
-    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16781: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_TypeswitchStatement16785: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_TypeswitchStatement16787: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_TypeswitchStatement16790: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
-    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16792: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
-    FOLLOW_DEFAULT_in_p_TypeswitchStatement16797: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_TypeswitchStatement16804: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_TypeswitchStatement16808: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_TypeswitchStatement16816: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16820: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_CASE_in_p_CaseStatement16849: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_CaseStatement16856: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_CaseStatement16860: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
-    FOLLOW_AS_in_p_CaseStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_SequenceType_in_p_CaseStatement16868: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
-    FOLLOW_RETURN_in_p_CaseStatement16872: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_CaseStatement16876: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Annotation_in_p_VarDeclStatement16903: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_VARIABLE_in_p_VarDeclStatement16908: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16914: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16918: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16922: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16926: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16928: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_COMMA_in_p_VarDeclStatement16944: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_VarDeclStatement16948: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_VarName_in_p_VarDeclStatement16952: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
-    FOLLOW_BIND_in_p_VarDeclStatement16960: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
-    FOLLOW_SEMICOLON_in_p_VarDeclStatement16979: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_WHILE_in_p_WhileStatement17007: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_p_WhileStatement17011: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Expr_in_p_WhileStatement17013: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
-    FOLLOW_RPAREN_in_p_WhileStatement17016: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_Hybrid_in_p_WhileStatement17018: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17045: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OrExpr_in_p_ExprSimple17057: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17072: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LBRACKET_in_p_BlockExpr17098: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17100: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
-    FOLLOW_RBRACKET_in_p_BlockExpr17102: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_CollectionDecl17133: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_CollectionDecl17137: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
-    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17139: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_CollectionTypeDecl17168: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
-    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17172: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17181: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INDEX_in_p_IndexDecl17211: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexName_in_p_IndexDecl17215: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_ON_in_p_IndexDecl17219: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
-    FOLLOW_NODES_in_p_IndexDecl17225: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17229: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
-    FOLLOW_BY_in_p_IndexDecl17233: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17237: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_COMMA_in_p_IndexDecl17240: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17242: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
-    FOLLOW_p_QName_in_p_IndexName17269: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17294: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17319: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
-    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17321: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
-    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17324: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17350: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_AS_in_p_IndexKeyTypeDecl17377: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17381: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
-    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17383: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_p_AtomicType17409: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLATION_in_p_IndexKeyCollation17436: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
-    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17440: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_INTEGRITY_in_p_ICDecl17467: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
-    FOLLOW_CONSTRAINT_in_p_ICDecl17473: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICDecl17477: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
-    FOLLOW_p_ICCollection_in_p_ICDecl17480: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICForeignKey_in_p_ICDecl17484: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_ON_in_p_ICCollection17512: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICCollection17518: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollection17522: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
-    FOLLOW_p_ICCollSequence_in_p_ICCollection17525: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17529: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_ICCollNode_in_p_ICCollection17533: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequence17561: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequence17565: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequence17571: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollSequence17575: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollSequenceUnique17603: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollSequenceUnique17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollSequenceUnique17619: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
-    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17625: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICCollSequenceUnique17631: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREACH_in_p_ICCollNode17662: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICCollNode17668: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICCollNode17674: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICCollNode17678: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_CHECK_in_p_ICCollNode17684: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_ExprSingle_in_p_ICCollNode17688: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FOREIGN_in_p_ICForeignKey17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKey17722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
-    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
-    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17728: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_FROM_in_p_ICForeignKeySource17755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17759: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TO_in_p_ICForeignKeyTarget17786: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
-    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17790: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17817: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17821: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
-    FOLLOW_NODE_in_p_ICForeignKeyValues17825: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
-    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17831: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_p_ICForeignKeyValues17835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
-    FOLLOW_KEY_in_p_ICForeignKeyValues17841: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17845: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTLiteralRange15538: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00010000]),
+    FOLLOW_MOST_in_p_FTLiteralRange15542: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15544: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_FTLiteralRange15562: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15564: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_TO_in_p_FTLiteralRange15566: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_L_IntegerLiteral_in_p_FTLiteralRange15568: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15604: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15608: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordOption15610: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15612: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_STOP_in_p_FTStopWordOption15631: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15635: new org.antlr.runtime.BitSet([0x00000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_FTStopWordOption15639: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_p_FTStopWordsInclExcl_in_p_FTStopWordOption15641: new org.antlr.runtime.BitSet([0x00000002, 0x00020000,0x00000000, 0x00000200]),
+    FOLLOW_NO_in_p_FTStopWordOption15660: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x40000000]),
+    FOLLOW_STOP_in_p_FTStopWordOption15664: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000080, 0x00000000]),
+    FOLLOW_WORDS_in_p_FTStopWordOption15668: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AT_in_p_FTStopWords15702: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15706: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_p_FTStopWords15720: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15722: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_FTStopWords15725: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTStopWords15727: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000400]),
+    FOLLOW_RPAREN_in_p_FTStopWords15731: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_UNION_in_p_FTStopWordsInclExcl15763: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_EXCEPT_in_p_FTStopWordsInclExcl15769: new org.antlr.runtime.BitSet([0x00200000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_p_FTStopWords_in_p_FTStopWordsInclExcl15772: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LANGUAGE_in_p_FTLanguageOption15804: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTLanguageOption15808: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NO_in_p_FTWildCardOption15845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000010, 0x00000000]),
+    FOLLOW_WILDCARDS_in_p_FTWildCardOption15849: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_OPTION_in_p_FTExtensionOption15882: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_FTExtensionOption15886: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_FTExtensionOption15888: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WITHOUT_in_p_FTIgnoreOption15916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_CONTENT_in_p_FTIgnoreOption15920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_UnionExpr_in_p_FTIgnoreOption15924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_StatementsAndOptionalExpr_in_p_Program15956: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_Statements15983: new org.antlr.runtime.BitSet([0xFFFF0002, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndExpr16011: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statements_in_p_StatementsAndOptionalExpr16038: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_HybridExprSingle_in_p_Hybrid16065: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Statement_in_p_Hybrid16078: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_AssignStatement_in_p_Statement16109: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_BreakStatement_in_p_Statement16121: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ContinueStatement_in_p_Statement16133: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExitStatement_in_p_Statement16145: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_VarDeclStatement_in_p_Statement16157: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_WhileStatement_in_p_Statement16169: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Expr_in_p_HybridExprSingle16196: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_HybridExprSingle16211: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ExprSimple_in_p_ApplyStatement16261: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ApplyStatement16263: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_AssignStatement16291: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_AssignStatement16295: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_BIND_in_p_AssignStatement16299: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_AssignStatement16301: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_AssignStatement16304: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockStatement16330: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockStatement16332: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockStatement16335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockHybrid16361: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F083,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Statements_in_p_BlockHybrid16363: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockHybrid16366: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_BREAK_in_p_BreakStatement16394: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_BreakStatement16400: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_BreakStatement16404: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CONTINUE_in_p_ContinueStatement16432: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000800, 0x00000000]),
+    FOLLOW_LOOP_in_p_ContinueStatement16438: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ContinueStatement16442: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_EXIT_in_p_ExitStatement16470: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00001000, 0x00000000]),
+    FOLLOW_RETURNING_in_p_ExitStatement16476: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ExitStatement16480: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000000]),
+    FOLLOW_SEMICOLON_in_p_ExitStatement16483: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_InitialClause_in_p_FLWORStatement16509: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_IntermediateClause_in_p_FLWORStatement16511: new org.antlr.runtime.BitSet([0x00000000, 0x00200000,0x04040040, 0x01084002]),
+    FOLLOW_p_ReturnStatement_in_p_FLWORStatement16514: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_RETURN_in_p_ReturnStatement16546: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_ReturnStatement16550: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_IF_in_p_IfStatement16579: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_IfStatement16583: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_IfStatement16585: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_IfStatement16588: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000020]),
+    FOLLOW_THEN_in_p_IfStatement16592: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16596: new org.antlr.runtime.BitSet([0x00000000, 0x00000800]),
+    FOLLOW_ELSE_in_p_IfStatement16601: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_IfStatement16605: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SWITCH_in_p_SwitchStatement16634: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_SwitchStatement16638: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_SwitchStatement16640: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_SwitchStatement16643: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_SwitchCaseStatement_in_p_SwitchStatement16645: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_SwitchStatement16650: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchStatement16656: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchStatement16660: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_SwitchCaseStatement16690: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SwitchCaseOperand_in_p_SwitchCaseStatement16694: new org.antlr.runtime.BitSet([0x04000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_SwitchCaseStatement16700: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_SwitchCaseStatement16704: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TRY_in_p_TryCatchStatement16733: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16737: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchStatement16742: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchStatement16746: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockStatement_in_p_TryCatchStatement16748: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TRY_in_p_TryCatchHybrid16780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16784: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_CATCH_in_p_TryCatchHybrid16790: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x01001001,0x01C01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_CatchErrorList_in_p_TryCatchHybrid16794: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_p_BlockHybrid_in_p_TryCatchHybrid16796: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00020000]),
+    FOLLOW_TYPESWITCH_in_p_TypeswitchStatement16829: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_TypeswitchStatement16833: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_TypeswitchStatement16835: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_TypeswitchStatement16838: new org.antlr.runtime.BitSet([0x04000000, 0x00000000]),
+    FOLLOW_p_CaseStatement_in_p_TypeswitchStatement16840: new org.antlr.runtime.BitSet([0x04000000, 0x00000008]),
+    FOLLOW_DEFAULT_in_p_TypeswitchStatement16845: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_TypeswitchStatement16852: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_TypeswitchStatement16856: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_TypeswitchStatement16864: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_TypeswitchStatement16868: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_CASE_in_p_CaseStatement16897: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_CaseStatement16904: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_CaseStatement16908: new org.antlr.runtime.BitSet([0x00080000, 0x00000000]),
+    FOLLOW_AS_in_p_CaseStatement16912: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x2FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_SequenceType_in_p_CaseStatement16916: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x04000000, 0x00000000]),
+    FOLLOW_RETURN_in_p_CaseStatement16920: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_CaseStatement16924: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Annotation_in_p_VarDeclStatement16951: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00001000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_VARIABLE_in_p_VarDeclStatement16956: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16962: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement16966: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement16970: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement16974: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement16976: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_COMMA_in_p_VarDeclStatement16992: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_VarDeclStatement16996: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_VarName_in_p_VarDeclStatement17000: new org.antlr.runtime.BitSet([0x00080000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_p_TypeDeclaration_in_p_VarDeclStatement17004: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000420]),
+    FOLLOW_BIND_in_p_VarDeclStatement17008: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_VarDeclStatement17010: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x20000400]),
+    FOLLOW_SEMICOLON_in_p_VarDeclStatement17027: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_WHILE_in_p_WhileStatement17055: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_p_WhileStatement17059: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Expr_in_p_WhileStatement17061: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x40000000, 0x00000000]),
+    FOLLOW_RPAREN_in_p_WhileStatement17064: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_Hybrid_in_p_WhileStatement17066: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QuantifiedExpr_in_p_ExprSimple17093: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OrExpr_in_p_ExprSimple17105: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_pg_UpdateExpr_in_p_ExprSimple17120: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LBRACKET_in_p_BlockExpr17146: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F081,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_StatementsAndExpr_in_p_BlockExpr17148: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000002]),
+    FOLLOW_RBRACKET_in_p_BlockExpr17150: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_CollectionDecl17181: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_CollectionDecl17185: new org.antlr.runtime.BitSet([0x00080002, 0x00000000]),
+    FOLLOW_p_CollectionTypeDecl_in_p_CollectionDecl17187: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_CollectionTypeDecl17216: new org.antlr.runtime.BitSet([0x80400000, 0x00000600,0x62004000, 0x10000010]),
+    FOLLOW_p_KindTest_in_p_CollectionTypeDecl17220: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_CollectionTypeDecl17229: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INDEX_in_p_IndexDecl17259: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexName_in_p_IndexDecl17263: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_ON_in_p_IndexDecl17267: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00400000, 0x00000000]),
+    FOLLOW_NODES_in_p_IndexDecl17273: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexDomainExpr_in_p_IndexDecl17277: new org.antlr.runtime.BitSet([0x02000000, 0x00000000]),
+    FOLLOW_BY_in_p_IndexDecl17281: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17285: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_COMMA_in_p_IndexDecl17288: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_IndexKeySpec_in_p_IndexDecl17290: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000400]),
+    FOLLOW_p_QName_in_p_IndexName17317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexDomainExpr17342: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_IndexKeyExpr_in_p_IndexKeySpec17367: new org.antlr.runtime.BitSet([0x40080002, 0x00000000]),
+    FOLLOW_p_IndexKeyTypeDecl_in_p_IndexKeySpec17369: new org.antlr.runtime.BitSet([0x40000002, 0x00000000]),
+    FOLLOW_p_IndexKeyCollation_in_p_IndexKeySpec17372: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_IndexKeyExpr17398: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_AS_in_p_IndexKeyTypeDecl17425: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_AtomicType_in_p_IndexKeyTypeDecl17429: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00003800]),
+    FOLLOW_p_OccurrenceIndicator_in_p_IndexKeyTypeDecl17431: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_p_AtomicType17457: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLATION_in_p_IndexKeyCollation17484: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x01C00300, 0x00000000]),
+    FOLLOW_p_StringLiteral_in_p_IndexKeyCollation17488: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_INTEGRITY_in_p_ICDecl17515: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00010000, 0x00000000]),
+    FOLLOW_CONSTRAINT_in_p_ICDecl17521: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICDecl17525: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00440000, 0x00000000]),
+    FOLLOW_p_ICCollection_in_p_ICDecl17528: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICForeignKey_in_p_ICDecl17532: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_ON_in_p_ICCollection17560: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICCollection17566: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollection17570: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000,0x00000000, 0x00000000,0x80020000, 0x00000000]),
+    FOLLOW_p_ICCollSequence_in_p_ICCollection17573: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollSequenceUnique_in_p_ICCollection17577: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_ICCollNode_in_p_ICCollection17581: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequence17609: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequence17613: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequence17619: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollSequence17623: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollSequenceUnique17651: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollSequenceUnique17657: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollSequenceUnique17661: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollSequenceUnique17667: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00800000, 0x00000000]),
+    FOLLOW_UNIQUE_in_p_ICCollSequenceUnique17673: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICCollSequenceUnique17679: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICCollSequenceUnique17683: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREACH_in_p_ICCollNode17710: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICCollNode17716: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICCollNode17722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICCollNode17726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_CHECK_in_p_ICCollNode17732: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E0F001,0x01F81320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_ExprSingle_in_p_ICCollNode17736: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FOREIGN_in_p_ICForeignKey17764: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKey17770: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000080]),
+    FOLLOW_p_ICForeignKeySource_in_p_ICForeignKey17774: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000040]),
+    FOLLOW_p_ICForeignKeyTarget_in_p_ICForeignKey17776: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_FROM_in_p_ICForeignKeySource17803: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeySource17807: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TO_in_p_ICForeignKeyTarget17834: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00008000, 0x00000000]),
+    FOLLOW_p_ICForeignKeyValues_in_p_ICForeignKeyTarget17838: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_COLLECTION_in_p_ICForeignKeyValues17865: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17869: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00004000, 0x00000000]),
+    FOLLOW_NODE_in_p_ICForeignKeyValues17873: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
+    FOLLOW_DOLLAR_in_p_ICForeignKeyValues17879: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000000,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_p_ICForeignKeyValues17883: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00200000, 0x00000000]),
+    FOLLOW_KEY_in_p_ICForeignKeyValues17889: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_PathExpr_in_p_ICForeignKeyValues17893: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_set_in_synpred1_XQueryParser3535: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x80000000, 0x00000000]),
     FOLLOW_DOLLAR_in_synpred1_XQueryParser3543: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_FOR_in_synpred1_XQueryParser3549: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000110, 0x00000000]),
@@ -42446,31 +42490,31 @@ org.antlr.lang.augmentObject(XQueryParser, {
     FOLLOW_LPAREN_in_synpred4_XQueryParser3635: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
     FOLLOW_TRY_in_synpred5_XQueryParser3655: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
     FOLLOW_LBRACKET_in_synpred5_XQueryParser3657: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_VALIDATE_in_synpred6_XQueryParser6185: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
-    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_TYPE_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_SLASH_in_synpred7_XQueryParser6549: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6551: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred8_XQueryParser6665: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6718: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_QName_in_synpred9_XQueryParser6726: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6729: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6747: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred9_XQueryParser6755: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6758: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_set_in_synpred9_XQueryParser6776: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
-    FOLLOW_LBRACKET_in_synpred9_XQueryParser6788: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_KindTest_in_synpred10_XQueryParser6818: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_QName_in_synpred11_XQueryParser6837: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred11_XQueryParser6839: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6857: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7296: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred14_XQueryParser7315: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
-    FOLLOW_COLON_in_synpred14_XQueryParser7317: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_NCName_in_synpred15_XQueryParser7335: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_LPAREN_in_synpred16_XQueryParser7591: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9602: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
-    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17176: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
+    FOLLOW_VALIDATE_in_synpred6_XQueryParser6189: new org.antlr.runtime.BitSet([0x00000002, 0x00000000,0x00000008, 0x00000004,0x00000200, 0x00000000]),
+    FOLLOW_p_ValidationMode_in_synpred6_XQueryParser6193: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_TYPE_in_synpred6_XQueryParser6197: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_SLASH_in_synpred7_XQueryParser6553: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xAFFFFFFF, 0x01E09001,0x01F01320, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_RelativePathExpr_in_synpred7_XQueryParser6555: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred8_XQueryParser6669: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6722: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_QName_in_synpred9_XQueryParser6730: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6733: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6751: new org.antlr.runtime.BitSet([0xFFFF0000, 0xFFFFFFFF,0xFFFFFFFF, 0xFFFFFFFF,0xF7FFFFFF, 0xFFFFFFFF,0x0FFFFFFF, 0x00000001,0x00001000, 0x00000000,0x00100000, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred9_XQueryParser6759: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6762: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_set_in_synpred9_XQueryParser6780: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000001]),
+    FOLLOW_LBRACKET_in_synpred9_XQueryParser6792: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_KindTest_in_synpred10_XQueryParser6822: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_QName_in_synpred11_XQueryParser6841: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x20000000, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred11_XQueryParser6843: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_PrimaryExpr_in_synpred12_XQueryParser6861: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_Wildcard_in_synpred13_XQueryParser7300: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred14_XQueryParser7319: new org.antlr.runtime.BitSet([0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x00000000,0x00000000, 0x02000000]),
+    FOLLOW_COLON_in_synpred14_XQueryParser7321: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_NCName_in_synpred15_XQueryParser7339: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_LPAREN_in_synpred16_XQueryParser7595: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred17_XQueryParser9650: new org.antlr.runtime.BitSet([0x00000002, 0x00000000]),
+    FOLLOW_p_OccurrenceIndicator_in_synpred18_XQueryParser17224: new org.antlr.runtime.BitSet([0x00000002, 0x00000000])
 });
 
 })();
diff --git a/lib/ace/mode/xquery/XQuerySemanticHighlighter.js b/lib/ace/mode/xquery/XQuerySemanticHighlighter.js
index 091315b7..5f71be4a 100644
--- a/lib/ace/mode/xquery/XQuerySemanticHighlighter.js
+++ b/lib/ace/mode/xquery/XQuerySemanticHighlighter.js
@@ -90,8 +90,9 @@ define(function(require, exports, module){
         }
         //Check if the tokenized line is equal to the original one:
         if(sourceLine == tokenizedLine) {
-          result[i] = { line: sourceLine, startState: previousState, tokens: { tokens: lineTokens, state: nextState } };
+          result[i] = { tokens: lineTokens, state: nextState };
         } else {
+          result[i] = undefined; 
         }
       }
       return result;
diff --git a/lib/ace/mode/xquery_tokenizer.js b/lib/ace/mode/xquery_tokenizer.js
deleted file mode 100644
index 1151859b..00000000
--- a/lib/ace/mode/xquery_tokenizer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      William Candillon <wcandillon AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-define(function(require, exports, module) {
-"use strict";
-  
-  var Tokenizer = require("../tokenizer").Tokenizer;
-  var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-
-  var XQueryTokenizer = exports.XQueryTokenizer = function(){
-    this.cache = [];
-    this.$regexpTokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-  };
-
-  (function() {
-    this.getLineTokens = function(line, startState) {
-      var cachedLine = null;
-      for(var i in this.cache)
-      {
-        var c = this.cache[i];
-        if(c && c.line == line && c.startState == startState) {
-          return c.tokens;
-        }
-      }
-      return this.$regexpTokenizer.getLineTokens(line, startState);
-    };
-  }).call(XQueryTokenizer.prototype);
-}); 
diff --git a/lib/ace/mode/xquery_worker.js b/lib/ace/mode/xquery_worker.js
index e2dadd34..3abea595 100644
--- a/lib/ace/mode/xquery_worker.js
+++ b/lib/ace/mode/xquery_worker.js
@@ -55,6 +55,7 @@ oop.inherits(XQueryWorker, Mirror);
 (function() {
     
   this.onUpdate = function() {
+    this.sender.emit("start");
     var value = this.doc.getValue();    
     var parser = xquery.getParser(value);
     var ast = parser.p_Module();