Merge lp:~zorba-coders/zorba/new-jsoniq-update into lp:zorba

[Ghislain Fourny]

Introducing new update syntax in the JSONiq parser.
- Made json keyword mandatory to avoid conflicts.
- Turned "replace json value of" into "replace value of json" to make consistent with XML updates, for BOTH parsers.
- New target syntax: delete $obj.foo, delete $arr[[1]], etc.

New JSONiq syntax:
- Made json keyword mandatory to avoid conflicts.
- Turned "replace json value of" into "replace value of json" to make consistent with XML updates.
- New target syntax: delete $obj.foo, delete $arr[[1]], etc.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 :
Votes: {'Pending': 1, 'Needs commit message': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/177/console to view the results.

[Matthias Brantner (matthias-brantner)]

Looks great. I'll approve and let you decide on one question:

Is it really necessary to make the expressions in the parsenodes non-const? Couldn't you use a unique pointer or auto_ptr in the parser that is passed
to convert_postfix_to_target_and_selector and only released when the JSON expression is created?

review: Approve

[Ghislain Fourny (gislenius)]

Hi Matthias,

I am not sure I understand what you are suggesting.

The reason for non-const is that temporary parse nodes (in that case a lookup expression node) use regular pointers that they own to child parse nodes, i.e., the destructor deletes the object pointed to at the end. However, these child parse nodes are still used by the final parsenodes (the updating expression nodes).

So one has to release these pointers (set them to NULL) to avoid that destruction.

With a unique pointer to temporary parsenodes released after the creation of the final parsenode, there would still be the problem that the temporary parsenodes would delete parsenodes that are actually used by the final parsenodes.

However, I will now attempt to simplify the external API to address this, and provide release functions instead.

Does it make sense?

Does it make sense?

[Ghislain Fourny (gislenius)]

After looking more in depth, I realized that there is an inconsistency across parsenodes. Some of them have const exprnode* pointers on their children (like JSONObjectLookup had), some others regular exprnode* pointers (like JSONObjectLookup has now). The latter seem to correspond to places that the parser edits (which is the case also here). So, I think that this change to JSONObjectLookup does not break the current design of parse node classes but stays within common practice.

Rather than just fix this class, I think that a discussion for a general fix in the entire parse node API makes more sense.

Actions taken:
- I am leaving the API of the class as it is.
- I cleaned up the API by replacing set_ functions with release_ functions.

HTH

[lp:~zorba-coders/zorba/new-jsoniq-update]

11377. By Ghislain Fourny on 2013-09-13

Clean up.

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/336/parsed_console to view the results.

[lp:~zorba-coders/zorba/new-jsoniq-update]

11378. By Ghislain Fourny on 2013-09-13

Regenerating.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295 :
Votes: {'Approve': 2, 'Needs commit message': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/178/console to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "TestZorbaUbuntu" failed.
1 tests failed (8490 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/296/testReport/ to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "TestZorbaUbuntu" failed.
2 tests failed (8490 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/297/testReport/ to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Stage "TestZorbaUbuntu" failed.
1 tests failed (8490 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/298/testReport/ to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq-update/+merge/185295

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-09-12 08:50:38 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-09-13 14:41:22 +0000
@@ -111,9 +111,104 @@
         RCHelper::removeReference( ref );
     }
 }
-
-/* Line 284 of lalr1.cc  */
-#line 117 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+/* Line 284 of lalr1.cc  */
+#line 1042 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+
+namespace {
+bool convert_postfix_to_target_and_selector(
+    exprnode* aPostfixExpr,
+    rchandle<exprnode>* aTargetExpr,
+    rchandle<exprnode>* aSelectorExpr,
+    string* anError,
+    bool allowArray = true)
+{
+  rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
+      dynamic_cast<DynamicFunctionInvocation*>(aPostfixExpr);
+  rchandle<FilterExpr> lFilterExpr = dynamic_cast<FilterExpr*>(aPostfixExpr);
+  rchandle<JSONObjectLookup> lObjectLookup = dynamic_cast<JSONObjectLookup*>(aPostfixExpr);
+
+
+  if (lDynamicFunctionInvocation != NULL) {
+    if (lDynamicFunctionInvocation->getArgList()->size() != 1)
+    {
+      *anError = "An object or array lookup with exactly one argument is expected. Zero or more than one argument were found.";
+      return false;
+    }
+    *aTargetExpr = lDynamicFunctionInvocation->getPrimaryExpr(),
+    *aSelectorExpr = lDynamicFunctionInvocation->getArgList()->operator[](0);
+    return true;
+  }
+
+
+  else if (lObjectLookup != NULL)
+  {
+    *aTargetExpr = lObjectLookup->get_object_expr();
+    lObjectLookup->release_object_expr();
+    *aSelectorExpr = lObjectLookup->get_selector_expr();
+    lObjectLookup->release_selector_expr();
+    return true;
+  }
+
+  else if (!allowArray && lFilterExpr != NULL)
+  {
+    *anError = "An object lookup is expected.";
+    return false;
+  }
+  else if (allowArray && lFilterExpr != NULL)
+  {
+    rchandle<exprnode> lPrimary = lFilterExpr->get_primary();
+    rchandle<PredicateList> lPredicateList = lFilterExpr->get_pred_list();
+    ulong lSize = lPredicateList->size();
+
+
+    if (lSize < 1)
+    {
+      *anError = "An object or array lookup with exactly one argument is expected. No argument was found.";
+      return false;
+    }
+    rchandle<JSONArrayConstructor> lConstructor =
+        dynamic_cast<JSONArrayConstructor*>(lPredicateList->operator[](lSize - 1).getp());
+    if (lConstructor == NULL)
+    {
+      *anError = "An object or array lookup is expected.";
+      return false;
+    }
+    *aSelectorExpr = lConstructor->get_expr();
+    if (aSelectorExpr == NULL)
+    {
+      *anError = "An object or array lookup with exactly one argument is expected. No argument was found.";
+      return false;
+    }
+    lConstructor->set_expr(NULL);
+
+
+    *aTargetExpr = lPrimary;
+    if (lSize > 1)
+    {
+      rchandle<PredicateList> lNewPredicateList =
+          new PredicateList(lPredicateList->get_location());
+      for (int i = 0; i < lSize - 1; ++i)
+      {
+        lNewPredicateList->push_back(lPredicateList->operator[](i));
+      }
+      *aTargetExpr = new FilterExpr(
+          lFilterExpr->get_location(),
+          lPrimary,
+          lNewPredicateList);
+    }
+    return true;
+  }
+
+  else
+  {
+    *anError = "An object or array lookup is expected.";
+    return false;
+  }
+};
+}
+
+/* Line 284 of lalr1.cc  */
+#line 212 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 
 
 # ifndef YY_NULL
@@ -208,7 +303,7 @@
 
 namespace zorba {
 /* Line 352 of lalr1.cc  */
-#line 212 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 307 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -314,2002 +409,2002 @@
 #line 902 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).decval); };
 /* Line 453 of lalr1.cc  */
-#line 318 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 413 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 126: /* "'DOUBLE'" */
 /* Line 453 of lalr1.cc  */
 #line 901 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).dval); };
 /* Line 453 of lalr1.cc  */
-#line 325 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 420 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 151: /* "'INTEGER'" */
 /* Line 453 of lalr1.cc  */
 #line 900 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).ival); };
 /* Line 453 of lalr1.cc  */
-#line 332 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 427 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 344: /* VersionDecl */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 339 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 434 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 345: /* MainModule */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 346 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 441 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* LibraryModule */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 353 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 448 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 347: /* ModuleDecl */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 360 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 455 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 348: /* SIND_DeclList */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 367 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 462 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 349: /* SIND_Decl */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 374 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 469 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 350: /* Setter */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 381 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 476 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 351: /* BoundarySpaceDecl */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 388 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 483 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 352: /* DefaultCollationDecl */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 395 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 490 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 353: /* BaseURIDecl */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 402 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 497 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 354: /* ConstructionDecl */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 409 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 504 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 355: /* OrderingModeDecl */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 416 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 511 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 356: /* EmptyOrderDecl */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 423 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 518 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 357: /* CopyNamespacesDecl */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 430 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 525 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 358: /* Import */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 437 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 532 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 359: /* SchemaImport */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 444 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 539 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 360: /* URILiteralList */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 451 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 546 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 361: /* SchemaPrefix */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 458 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 553 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 362: /* ModuleImport */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 465 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 560 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 363: /* NamespaceDecl */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 472 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 567 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 364: /* DefaultNamespaceDecl */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 479 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 574 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 365: /* VFO_DeclList */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 486 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 581 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 366: /* VFO_Decl */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 493 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 588 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 367: /* DecimalFormatDecl */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 500 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 595 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 368: /* DecimalFormatParamList */
 /* Line 453 of lalr1.cc  */
 #line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).vstrpair); };
 /* Line 453 of lalr1.cc  */
-#line 507 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 602 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 369: /* DecimalFormatParam */
 /* Line 453 of lalr1.cc  */
 #line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).strpair); };
 /* Line 453 of lalr1.cc  */
-#line 514 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 609 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 371: /* OptionDecl */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 521 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 616 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 372: /* FTOptionDecl */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 528 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 623 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* CtxItemDecl */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 535 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 630 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 374: /* CtxItemDecl2 */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 542 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 637 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 375: /* CtxItemDecl3 */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 549 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 644 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 376: /* CtxItemDecl4 */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 556 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 651 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 377: /* VarDecl */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 563 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 658 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 378: /* VarNameAndType */
 /* Line 453 of lalr1.cc  */
 #line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).varnametype); };
 /* Line 453 of lalr1.cc  */
-#line 570 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 665 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 379: /* AnnotationList */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 577 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 672 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 380: /* Annotation */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 584 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 679 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* AnnotationLiteralList */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 591 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 686 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 382: /* FunctionDecl */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 598 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 693 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 383: /* FunctionDecl2 */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 605 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 700 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 384: /* FunctionDeclSimple */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 612 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 707 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 385: /* FunctionDeclUpdating */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 619 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 714 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 386: /* FunctionSig */
 /* Line 453 of lalr1.cc  */
 #line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).fnsig); };
 /* Line 453 of lalr1.cc  */
-#line 626 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 721 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 387: /* ParamList */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 633 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 728 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 388: /* Param */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 640 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 735 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* CollectionDecl */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 647 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 742 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 391: /* IndexDecl */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 654 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 749 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 392: /* IndexKeyList */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 661 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 756 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 393: /* IndexKeySpec */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 668 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 763 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 394: /* IntegrityConstraintDecl */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 675 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 770 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 395: /* QueryBody */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 682 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 777 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 396: /* StatementsAndOptionalExprTop */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 689 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 784 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 397: /* StatementsAndOptionalExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 696 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 791 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 398: /* StatementsAndExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 703 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 798 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 399: /* Statements */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 710 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 805 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 400: /* Statement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 717 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 812 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 401: /* BlockStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 724 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 819 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 402: /* BlockExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 731 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 826 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 403: /* EnclosedStatementsAndOptionalExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 738 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 833 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 404: /* VarDeclStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 745 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 840 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 407: /* AssignStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 752 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 847 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 408: /* ApplyStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 759 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 854 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 409: /* ExitStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 766 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 861 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 410: /* WhileStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 773 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 868 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 411: /* FlowCtlStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 780 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 875 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 412: /* FLWORStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 787 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 882 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 413: /* ReturnStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 794 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 889 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 414: /* IfStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 801 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 896 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 415: /* TryStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 808 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 903 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 416: /* CatchListStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 815 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 910 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 417: /* CatchStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 822 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 418: /* VoidStatement */
 /* Line 453 of lalr1.cc  */
 #line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 829 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 419: /* Expr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 836 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 420: /* ExprSingle */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 843 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 938 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 421: /* ExprSimple */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 850 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 945 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 422: /* FLWORExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 857 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 952 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 423: /* ReturnExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 864 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 959 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 427: /* FLWORWinCond */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 871 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 966 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 428: /* WindowClause */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 878 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 973 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 429: /* CountClause */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 885 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 980 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 430: /* ForLetWinClause */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 892 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 987 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 432: /* FLWORClauseList */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 899 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 994 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 433: /* ForClause */
 /* Line 453 of lalr1.cc  */
 #line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 906 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1001 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 435: /* VarInDeclList */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 913 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1008 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 436: /* VarInDecl */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1015 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 437: /* PositionalVar */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1022 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 438: /* FTScoreVar */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 934 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1029 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 439: /* LetClause */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 941 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1036 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 440: /* VarGetsDeclList */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1043 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 441: /* VarGetsDecl */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 955 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1050 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 442: /* WindowVarDecl */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 962 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1057 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 443: /* WindowVars */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 969 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1064 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 444: /* WindowVars3 */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 976 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1071 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 445: /* WindowVars2 */
 /* Line 453 of lalr1.cc  */
 #line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 983 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1078 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 446: /* WhereClause */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 990 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1085 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 447: /* GroupByClause */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 997 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1092 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 448: /* GroupSpecList */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1004 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1099 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 449: /* GroupSpec */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1011 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1106 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 450: /* GroupCollationSpec */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1018 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1113 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 451: /* OrderByClause */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1025 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1120 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 452: /* OrderSpecList */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1032 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1127 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 453: /* OrderSpec */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1039 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1134 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 454: /* OrderModifier */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1046 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1141 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 455: /* OrderDirSpec */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1053 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1148 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 456: /* OrderEmptySpec */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1060 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1155 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 457: /* OrderCollationSpec */
 /* Line 453 of lalr1.cc  */
 #line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1067 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1162 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 458: /* QuantifiedExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1074 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1169 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 459: /* QVarInDeclList */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1081 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1176 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 460: /* QVarInDecl */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1088 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1183 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 461: /* SwitchExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1095 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1190 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 462: /* SwitchCaseClauseList */
 /* Line 453 of lalr1.cc  */
 #line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1102 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1197 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 463: /* SwitchCaseClause */
 /* Line 453 of lalr1.cc  */
 #line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1109 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1204 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 464: /* SwitchCaseOperandList */
 /* Line 453 of lalr1.cc  */
 #line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1116 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1211 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 465: /* SwitchStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1123 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1218 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 468: /* TypeswitchExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1130 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1225 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 469: /* TypeswitchStatement */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1137 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1232 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 470: /* CaseClauseList */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1144 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1239 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 471: /* CaseClause */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1151 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1246 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 474: /* SequenceTypeList */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1158 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1253 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 475: /* IfExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1165 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1260 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 476: /* OrExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1172 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1267 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 477: /* AndExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1179 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1274 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 478: /* NotExpr */
 /* Line 453 of lalr1.cc  */
 #line 935 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1186 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1281 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 479: /* ComparisonExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1193 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1288 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 481: /* FTContainsExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1200 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1295 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 482: /* StringConcatExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1207 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1302 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 483: /* opt_FTIgnoreOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1214 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1309 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 484: /* RangeExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1221 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1316 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 485: /* AdditiveExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1228 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1323 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 486: /* MultiplicativeExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1235 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1330 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 487: /* UnionExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1242 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1337 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 488: /* IntersectExceptExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1249 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1344 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 489: /* InstanceofExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1256 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1351 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 490: /* TreatExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1263 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1358 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 491: /* CastableExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1270 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1365 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 492: /* CastExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1277 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1372 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 493: /* SingleType */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1284 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1379 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 494: /* UnaryExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1291 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1386 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 495: /* SignList */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1298 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1393 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 496: /* ValueExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1305 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1400 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 497: /* SimpleMapExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1312 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1407 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 498: /* ValueComp */
 /* Line 453 of lalr1.cc  */
 #line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1319 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1414 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 499: /* NodeComp */
 /* Line 453 of lalr1.cc  */
 #line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1326 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1421 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 500: /* ValidateExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1333 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1428 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 501: /* ExtensionExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1340 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1435 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 502: /* Pragma_list */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1347 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1442 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 503: /* Pragma */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1354 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1449 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 504: /* PathExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1361 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1456 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 506: /* RelativePathExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1368 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1463 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 507: /* StepExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1375 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1470 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 508: /* AxisStep */
 /* Line 453 of lalr1.cc  */
 #line 945 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1382 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1477 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 509: /* ForwardStep */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1389 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1484 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 510: /* ForwardAxis */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1396 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1491 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 511: /* AbbrevForwardStep */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1403 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1498 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 512: /* ReverseStep */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1410 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1505 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 513: /* ReverseAxis */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1417 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1512 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 514: /* NodeTest */
 /* Line 453 of lalr1.cc  */
 #line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1424 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1519 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 515: /* NameTest */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1431 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1526 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 516: /* Wildcard */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1438 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1533 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 517: /* PostfixExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1445 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1540 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 518: /* PredicateList */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1452 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1547 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 519: /* Predicate */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1459 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1554 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 520: /* PrimaryExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1466 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1561 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 521: /* Literal */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1473 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1568 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 522: /* NumericLiteral */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1480 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1575 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 523: /* VarRef */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1487 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1582 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 524: /* ParenthesizedExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1494 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1589 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 525: /* ContextItemExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1501 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1596 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 526: /* OrderedExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1508 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1603 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 527: /* UnorderedExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1515 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1610 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 528: /* FunctionCall */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1522 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1617 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 529: /* ArgList */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1529 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1624 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 533: /* Constructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1536 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1631 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 534: /* DirectConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1543 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1638 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 535: /* DirElemConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1550 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1645 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 536: /* DirElemContentList */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1557 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1652 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 537: /* DirAttributeList */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1564 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1659 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 538: /* DirAttr */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1571 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1666 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 540: /* DirAttributeValue */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1578 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1673 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 541: /* opt_QuoteAttrContentList */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1585 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1680 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 542: /* QuoteAttrContentList */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1592 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1687 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 543: /* opt_AposAttrContentList */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1599 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1694 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 544: /* AposAttrContentList */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1606 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1701 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 545: /* QuoteAttrValueContent */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1613 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1708 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 546: /* AposAttrValueContent */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1620 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1715 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 547: /* DirElemContent */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1627 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1722 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 548: /* CommonContent */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1634 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1729 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 549: /* DirCommentConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1641 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1736 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 550: /* DirPIConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1648 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1743 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 551: /* CDataSection */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1655 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1750 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 552: /* ComputedConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1662 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1757 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 553: /* CompDocConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1669 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1764 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 554: /* CompElemConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1676 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1771 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 555: /* CompAttrConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1683 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1778 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 556: /* CompTextConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1690 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1785 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 557: /* CompCommentConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1697 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1792 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 558: /* CompPIConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1704 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1799 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 559: /* CompNamespaceConstructor */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1711 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1806 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 560: /* TypeDeclaration */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1718 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1813 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 561: /* SequenceType */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1725 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1820 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 562: /* OccurrenceIndicator */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1732 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1827 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 563: /* ItemType */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1739 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1834 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 564: /* TypeList */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1746 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1841 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 565: /* GeneralizedAtomicType */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1753 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1848 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 566: /* SimpleType */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1760 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1855 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 567: /* KindTest */
 /* Line 453 of lalr1.cc  */
 #line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1767 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1862 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 568: /* AnyKindTest */
 /* Line 453 of lalr1.cc  */
 #line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1774 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1869 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 570: /* DocumentTest */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1781 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1876 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 571: /* NamespaceTest */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1788 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1883 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 572: /* TextTest */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1795 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1890 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 573: /* CommentTest */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1802 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1897 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 574: /* PITest */
 /* Line 453 of lalr1.cc  */
 #line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1809 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1904 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 575: /* AttributeTest */
 /* Line 453 of lalr1.cc  */
 #line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1816 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1911 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 576: /* SchemaAttributeTest */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1823 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1918 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 577: /* ElementTest */
 /* Line 453 of lalr1.cc  */
 #line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1830 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 578: /* SchemaElementTest */
 /* Line 453 of lalr1.cc  */
 #line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1837 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 579: /* TypeName */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1844 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 580: /* TypeName_WITH_HOOK */
 /* Line 453 of lalr1.cc  */
 #line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1851 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1946 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 581: /* StringLiteral */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1858 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1953 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 583: /* AnyFunctionTest */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1865 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1960 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 584: /* TypedFunctionTest */
 /* Line 453 of lalr1.cc  */
 #line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1872 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1967 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 587: /* InsertExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1879 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1974 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 588: /* DeleteExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1886 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1981 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 589: /* ReplaceExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1893 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1988 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* RenameExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1900 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 1995 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 591: /* TransformExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1907 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2002 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 592: /* VarNameList */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1914 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2009 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 593: /* VarNameDecl */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2016 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 594: /* TryExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2023 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 595: /* CatchListExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1935 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2030 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 596: /* CatchExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2037 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 597: /* BracedExpr */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1949 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2044 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 598: /* NameTestList */
 /* Line 453 of lalr1.cc  */
 #line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).name_test_list); };
 /* Line 453 of lalr1.cc  */
-#line 1956 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2051 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 599: /* FTSelection */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1963 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2058 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 602: /* FTOr */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1970 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2065 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 603: /* FTAnd */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1977 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2072 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 604: /* FTMildNot */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1984 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2079 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 605: /* FTUnaryNot */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1991 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2086 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 606: /* FTPrimaryWithOptions */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1998 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2093 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 607: /* opt_FTMatchOptions */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2005 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2100 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 609: /* FTWeight */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2012 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2107 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 610: /* FTPrimary */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2019 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2114 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 611: /* opt_FTTimes */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2026 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2121 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 612: /* FTExtensionSelection */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2033 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2128 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 614: /* FTWords */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2040 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2135 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 615: /* FTWordsValue */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2047 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2142 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 617: /* FTAnyallOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2054 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2149 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 620: /* FTPosFilter */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2061 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2156 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 621: /* FTOrder */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2068 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2163 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 622: /* FTWindow */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2075 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2170 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 623: /* FTDistance */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2082 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2177 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 624: /* FTUnit */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2089 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2184 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 625: /* FTMatchOptions */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2096 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2191 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 626: /* FTMatchOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2103 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2198 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 627: /* FTCaseOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2110 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2205 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 628: /* FTDiacriticsOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2117 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2212 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 629: /* FTExtensionOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2124 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2219 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 630: /* FTStemOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2131 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2226 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 631: /* FTThesaurusOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2138 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2233 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 635: /* FTThesaurusID */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2145 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2240 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 638: /* FTStopWordOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2152 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2247 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 639: /* FTStopWords */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2159 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2254 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 643: /* FTStopWordsInclExcl */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2166 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2261 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 644: /* FTLanguageOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2173 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2268 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 645: /* FTWildCardOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2180 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2275 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 646: /* FTContent */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2187 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2282 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 647: /* FTTimes */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2194 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2289 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 648: /* FTRange */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2201 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2296 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 649: /* FTScope */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2208 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2303 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 650: /* FTBigUnit */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2215 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2310 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 651: /* FTIgnoreOption */
 /* Line 453 of lalr1.cc  */
 #line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2222 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2317 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 652: /* JSONArrayConstructor */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2229 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2324 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 653: /* JSONSimpleObjectUnion */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2236 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2331 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 654: /* JSONAccumulatorObjectUnion */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2243 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2338 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 655: /* JSONObjectConstructor */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2250 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2345 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 656: /* JSONPairList */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2257 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2352 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 657: /* JSONInsertExpr */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2264 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2359 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 658: /* JSONAppendExpr */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2271 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2366 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 659: /* JSONDeleteExpr */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2278 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2373 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 660: /* JSONRenameExpr */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2285 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2380 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 661: /* JSONReplaceExpr */
 /* Line 453 of lalr1.cc  */
 #line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2292 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2387 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 664: /* QNAME */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2299 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2394 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 665: /* FUNCTION_NAME */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2306 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2401 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 666: /* EQNAME */
 /* Line 453 of lalr1.cc  */
 #line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2313 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2408 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 	break;
 
 	default:
@@ -2404,7 +2499,7 @@
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 /* Line 538 of lalr1.cc  */
-#line 2408 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+#line 2503 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2522,7 +2617,7 @@
       {
 	  case 3:
 /* Line 661 of lalr1.cc  */
-#line 1052 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1149 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2530,7 +2625,7 @@
 
   case 4:
 /* Line 661 of lalr1.cc  */
-#line 1056 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1153 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2538,7 +2633,7 @@
 
   case 5:
 /* Line 661 of lalr1.cc  */
-#line 1060 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1157 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -2546,7 +2641,7 @@
 
   case 6:
 /* Line 661 of lalr1.cc  */
-#line 1068 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1165 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL;
       }
@@ -2554,7 +2649,7 @@
 
   case 7:
 /* Line 661 of lalr1.cc  */
-#line 1074 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1171 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -2562,7 +2657,7 @@
 
   case 8:
 /* Line 661 of lalr1.cc  */
-#line 1078 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1175 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -2570,7 +2665,7 @@
 
   case 9:
 /* Line 661 of lalr1.cc  */
-#line 1087 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1184 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -2579,7 +2674,7 @@
 
   case 10:
 /* Line 661 of lalr1.cc  */
-#line 1093 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1190 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
       mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -2590,7 +2685,7 @@
 
   case 11:
 /* Line 661 of lalr1.cc  */
-#line 1101 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1198 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -2599,7 +2694,7 @@
 
   case 12:
 /* Line 661 of lalr1.cc  */
-#line 1107 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1204 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
       lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -2610,7 +2705,7 @@
 
   case 13:
 /* Line 661 of lalr1.cc  */
-#line 1118 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1215 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
     }
@@ -2618,7 +2713,7 @@
 
   case 14:
 /* Line 661 of lalr1.cc  */
-#line 1123 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1220 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)), VersionDecl::jsoniq );
     }
@@ -2626,7 +2721,7 @@
 
   case 15:
 /* Line 661 of lalr1.cc  */
-#line 1132 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1229 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -2636,7 +2731,7 @@
 
   case 16:
 /* Line 661 of lalr1.cc  */
-#line 1139 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1236 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -2646,7 +2741,7 @@
 
   case 17:
 /* Line 661 of lalr1.cc  */
-#line 1146 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1243 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -2658,7 +2753,7 @@
 
   case 18:
 /* Line 661 of lalr1.cc  */
-#line 1155 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1252 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
@@ -2666,7 +2761,7 @@
 
   case 19:
 /* Line 661 of lalr1.cc  */
-#line 1162 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1259 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr);
       (yylocation_stack_[(3) - (1)]).step();
@@ -2677,7 +2772,7 @@
 
   case 20:
 /* Line 661 of lalr1.cc  */
-#line 1170 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1267 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr);
       (yylocation_stack_[(3) - (1)]).step();
@@ -2688,7 +2783,7 @@
 
   case 21:
 /* Line 661 of lalr1.cc  */
-#line 1178 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1275 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr);
       (yylocation_stack_[(5) - (3)]).step();
@@ -2699,7 +2794,7 @@
 
   case 22:
 /* Line 661 of lalr1.cc  */
-#line 1186 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1283 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr);
       (yylocation_stack_[(5) - (1)]).step();
@@ -2710,7 +2805,7 @@
 
   case 23:
 /* Line 661 of lalr1.cc  */
-#line 1197 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1294 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
@@ -2718,7 +2813,7 @@
 
   case 24:
 /* Line 661 of lalr1.cc  */
-#line 1202 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1299 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -2728,7 +2823,7 @@
 
   case 25:
 /* Line 661 of lalr1.cc  */
-#line 1209 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1306 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -2738,7 +2833,7 @@
 
   case 26:
 /* Line 661 of lalr1.cc  */
-#line 1216 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1313 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -2750,7 +2845,7 @@
 
   case 27:
 /* Line 661 of lalr1.cc  */
-#line 1228 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1325 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(6) - (3)].expr), (yylocation_stack_[(6) - (3)]));
       (yyval.node) = new ModuleDecl( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
@@ -2760,7 +2855,7 @@
 
   case 28:
 /* Line 661 of lalr1.cc  */
-#line 1238 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1335 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -2770,7 +2865,7 @@
 
   case 29:
 /* Line 661 of lalr1.cc  */
-#line 1245 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1342 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -2779,7 +2874,7 @@
 
   case 30:
 /* Line 661 of lalr1.cc  */
-#line 1252 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1349 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
 
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
@@ -2791,7 +2886,7 @@
 
   case 44:
 /* Line 661 of lalr1.cc  */
-#line 1287 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1384 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -2799,7 +2894,7 @@
 
   case 45:
 /* Line 661 of lalr1.cc  */
-#line 1292 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1389 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -2807,7 +2902,7 @@
 
   case 46:
 /* Line 661 of lalr1.cc  */
-#line 1300 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1397 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -2815,7 +2910,7 @@
 
   case 47:
 /* Line 661 of lalr1.cc  */
-#line 1308 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1405 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -2823,7 +2918,7 @@
 
   case 48:
 /* Line 661 of lalr1.cc  */
-#line 1316 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1413 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -2831,7 +2926,7 @@
 
   case 49:
 /* Line 661 of lalr1.cc  */
-#line 1321 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1418 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -2839,7 +2934,7 @@
 
   case 50:
 /* Line 661 of lalr1.cc  */
-#line 1329 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1426 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -2847,7 +2942,7 @@
 
   case 51:
 /* Line 661 of lalr1.cc  */
-#line 1334 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1431 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -2855,7 +2950,7 @@
 
   case 52:
 /* Line 661 of lalr1.cc  */
-#line 1342 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1439 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -2863,7 +2958,7 @@
 
   case 53:
 /* Line 661 of lalr1.cc  */
-#line 1347 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1444 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -2871,7 +2966,7 @@
 
   case 54:
 /* Line 661 of lalr1.cc  */
-#line 1355 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1452 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
@@ -2879,7 +2974,7 @@
 
   case 55:
 /* Line 661 of lalr1.cc  */
-#line 1360 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1457 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
@@ -2887,7 +2982,7 @@
 
   case 56:
 /* Line 661 of lalr1.cc  */
-#line 1365 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1462 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
@@ -2895,7 +2990,7 @@
 
   case 57:
 /* Line 661 of lalr1.cc  */
-#line 1370 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1467 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
@@ -2903,7 +2998,7 @@
 
   case 60:
 /* Line 661 of lalr1.cc  */
-#line 1383 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1480 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yyval.node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\"");
@@ -2913,7 +3008,7 @@
 
   case 61:
 /* Line 661 of lalr1.cc  */
-#line 1393 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1490 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
@@ -2921,7 +3016,7 @@
 
   case 62:
 /* Line 661 of lalr1.cc  */
-#line 1398 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1495 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -2932,7 +3027,7 @@
 
   case 63:
 /* Line 661 of lalr1.cc  */
-#line 1406 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1503 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -2943,7 +3038,7 @@
 
   case 64:
 /* Line 661 of lalr1.cc  */
-#line 1414 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1511 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -2954,7 +3049,7 @@
 
   case 65:
 /* Line 661 of lalr1.cc  */
-#line 1425 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1522 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -2964,7 +3059,7 @@
 
   case 66:
 /* Line 661 of lalr1.cc  */
-#line 1432 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1529 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -2975,7 +3070,7 @@
 
   case 67:
 /* Line 661 of lalr1.cc  */
-#line 1443 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1540 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(3) - (2)].expr), (yylocation_stack_[(3) - (2)]));
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)));
@@ -2984,7 +3079,7 @@
 
   case 68:
 /* Line 661 of lalr1.cc  */
-#line 1449 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1546 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -2992,7 +3087,7 @@
 
   case 69:
 /* Line 661 of lalr1.cc  */
-#line 1457 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1554 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3002,7 +3097,7 @@
 
   case 70:
 /* Line 661 of lalr1.cc  */
-#line 1464 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1561 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(6) - (4)].expr), (yylocation_stack_[(6) - (4)]));
       (yyval.node) = new ModuleImport(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
@@ -3012,7 +3107,7 @@
 
   case 71:
 /* Line 661 of lalr1.cc  */
-#line 1471 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1568 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3024,7 +3119,7 @@
 
   case 72:
 /* Line 661 of lalr1.cc  */
-#line 1480 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1577 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(8) - (4)].expr), (yylocation_stack_[(8) - (4)]));
       (yyval.node) = new ModuleImport(LOC((yyloc)),
@@ -3038,7 +3133,7 @@
 
   case 73:
 /* Line 661 of lalr1.cc  */
-#line 1494 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1591 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(5) - (3)].expr), (yylocation_stack_[(5) - (3)]));
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
@@ -3047,7 +3142,7 @@
 
   case 74:
 /* Line 661 of lalr1.cc  */
-#line 1503 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1600 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3057,7 +3152,7 @@
 
   case 75:
 /* Line 661 of lalr1.cc  */
-#line 1510 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1607 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3067,7 +3162,7 @@
 
   case 76:
 /* Line 661 of lalr1.cc  */
-#line 1520 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1617 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3077,7 +3172,7 @@
 
   case 77:
 /* Line 661 of lalr1.cc  */
-#line 1527 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1624 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3086,7 +3181,7 @@
 
   case 78:
 /* Line 661 of lalr1.cc  */
-#line 1534 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1631 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       (yylocation_stack_[(3) - (1)]).step();
@@ -3097,7 +3192,7 @@
 
   case 87:
 /* Line 661 of lalr1.cc  */
-#line 1557 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1654 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3106,7 +3201,7 @@
 
   case 88:
 /* Line 661 of lalr1.cc  */
-#line 1563 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1660 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3115,7 +3210,7 @@
 
   case 89:
 /* Line 661 of lalr1.cc  */
-#line 1572 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1669 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3125,7 +3220,7 @@
 
   case 90:
 /* Line 661 of lalr1.cc  */
-#line 1579 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1676 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3135,7 +3230,7 @@
 
   case 91:
 /* Line 661 of lalr1.cc  */
-#line 1589 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1686 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       StringLiteral *sl = static_cast<StringLiteral*>((yysemantic_stack_[(3) - (3)].expr));
       (yyval.strpair) = new string_pair_t( (yysemantic_stack_[(3) - (1)].strval), sl->get_strval().str() );
@@ -3145,67 +3240,67 @@
 
   case 92:
 /* Line 661 of lalr1.cc  */
-#line 1598 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1695 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 93:
 /* Line 661 of lalr1.cc  */
-#line 1599 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1696 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 94:
 /* Line 661 of lalr1.cc  */
-#line 1600 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1697 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 95:
 /* Line 661 of lalr1.cc  */
-#line 1601 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1698 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "infinity"; }
     break;
 
   case 96:
 /* Line 661 of lalr1.cc  */
-#line 1602 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1699 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 97:
 /* Line 661 of lalr1.cc  */
-#line 1603 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1700 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 98:
 /* Line 661 of lalr1.cc  */
-#line 1604 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1701 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 99:
 /* Line 661 of lalr1.cc  */
-#line 1605 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1702 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 100:
 /* Line 661 of lalr1.cc  */
-#line 1606 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1703 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 101:
 /* Line 661 of lalr1.cc  */
-#line 1607 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1704 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 102:
 /* Line 661 of lalr1.cc  */
-#line 1613 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1710 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
 
@@ -3224,7 +3319,7 @@
 
   case 103:
 /* Line 661 of lalr1.cc  */
-#line 1632 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1729 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3232,7 +3327,7 @@
 
   case 104:
 /* Line 661 of lalr1.cc  */
-#line 1640 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1737 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3240,7 +3335,7 @@
 
   case 105:
 /* Line 661 of lalr1.cc  */
-#line 1648 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1745 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3250,7 +3345,7 @@
 
   case 106:
 /* Line 661 of lalr1.cc  */
-#line 1655 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1752 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3258,7 +3353,7 @@
 
   case 107:
 /* Line 661 of lalr1.cc  */
-#line 1663 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1760 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3268,7 +3363,7 @@
 
   case 108:
 /* Line 661 of lalr1.cc  */
-#line 1670 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1767 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3276,7 +3371,7 @@
 
   case 109:
 /* Line 661 of lalr1.cc  */
-#line 1675 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1772 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3284,7 +3379,7 @@
 
   case 110:
 /* Line 661 of lalr1.cc  */
-#line 1683 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1780 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3292,7 +3387,7 @@
 
   case 111:
 /* Line 661 of lalr1.cc  */
-#line 1691 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1788 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3309,7 +3404,7 @@
 
   case 112:
 /* Line 661 of lalr1.cc  */
-#line 1705 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1802 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3326,7 +3421,7 @@
 
   case 113:
 /* Line 661 of lalr1.cc  */
-#line 1719 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1816 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3343,7 +3438,7 @@
 
   case 114:
 /* Line 661 of lalr1.cc  */
-#line 1736 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1833 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
@@ -3351,7 +3446,7 @@
 
   case 115:
 /* Line 661 of lalr1.cc  */
-#line 1741 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1838 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3362,7 +3457,7 @@
 
   case 116:
 /* Line 661 of lalr1.cc  */
-#line 1749 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1846 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3373,7 +3468,7 @@
 
   case 117:
 /* Line 661 of lalr1.cc  */
-#line 1757 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1854 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3384,7 +3479,7 @@
 
   case 118:
 /* Line 661 of lalr1.cc  */
-#line 1768 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1865 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3392,7 +3487,7 @@
 
   case 119:
 /* Line 661 of lalr1.cc  */
-#line 1773 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1870 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<AnnotationListParsenode*>((yysemantic_stack_[(2) - (1)].node))->push_back(static_cast<AnnotationParsenode*>((yysemantic_stack_[(2) - (2)].node)));
       (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
@@ -3401,7 +3496,7 @@
 
   case 120:
 /* Line 661 of lalr1.cc  */
-#line 1782 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1879 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
@@ -3409,7 +3504,7 @@
 
   case 121:
 /* Line 661 of lalr1.cc  */
-#line 1787 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1884 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3419,7 +3514,7 @@
 
   case 122:
 /* Line 661 of lalr1.cc  */
-#line 1794 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1891 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
@@ -3427,7 +3522,7 @@
 
   case 123:
 /* Line 661 of lalr1.cc  */
-#line 1799 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1896 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -3437,7 +3532,7 @@
 
   case 124:
 /* Line 661 of lalr1.cc  */
-#line 1809 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1906 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -3445,7 +3540,7 @@
 
   case 125:
 /* Line 661 of lalr1.cc  */
-#line 1814 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1911 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3454,7 +3549,7 @@
 
   case 126:
 /* Line 661 of lalr1.cc  */
-#line 1823 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -3463,7 +3558,7 @@
 
   case 127:
 /* Line 661 of lalr1.cc  */
-#line 1829 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -3476,7 +3571,7 @@
 
   case 130:
 /* Line 661 of lalr1.cc  */
-#line 1848 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1945 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* body = (yysemantic_stack_[(4) - (4)].expr);
       if (body == NULL)
@@ -3495,7 +3590,7 @@
 
   case 131:
 /* Line 661 of lalr1.cc  */
-#line 1863 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1960 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -3510,7 +3605,7 @@
 
   case 132:
 /* Line 661 of lalr1.cc  */
-#line 1878 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1975 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* body = (yysemantic_stack_[(5) - (5)].expr);
       if (body == NULL)
@@ -3529,7 +3624,7 @@
 
   case 133:
 /* Line 661 of lalr1.cc  */
-#line 1894 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 1991 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -3544,7 +3639,7 @@
 
   case 134:
 /* Line 661 of lalr1.cc  */
-#line 1909 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2006 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -3552,7 +3647,7 @@
 
   case 135:
 /* Line 661 of lalr1.cc  */
-#line 1914 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2011 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -3560,7 +3655,7 @@
 
   case 136:
 /* Line 661 of lalr1.cc  */
-#line 1919 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2016 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
@@ -3568,7 +3663,7 @@
 
   case 137:
 /* Line 661 of lalr1.cc  */
-#line 1924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2021 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
@@ -3576,7 +3671,7 @@
 
   case 138:
 /* Line 661 of lalr1.cc  */
-#line 1932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2029 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -3586,7 +3681,7 @@
 
   case 139:
 /* Line 661 of lalr1.cc  */
-#line 1939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2036 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
         pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -3597,7 +3692,7 @@
 
   case 140:
 /* Line 661 of lalr1.cc  */
-#line 1950 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2047 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
@@ -3605,7 +3700,7 @@
 
   case 141:
 /* Line 661 of lalr1.cc  */
-#line 1955 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2052 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -3615,7 +3710,7 @@
 
   case 142:
 /* Line 661 of lalr1.cc  */
-#line 1965 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2062 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -3628,7 +3723,7 @@
 
   case 143:
 /* Line 661 of lalr1.cc  */
-#line 1974 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2071 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -3641,7 +3736,7 @@
 
   case 144:
 /* Line 661 of lalr1.cc  */
-#line 1983 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2080 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3654,7 +3749,7 @@
 
   case 145:
 /* Line 661 of lalr1.cc  */
-#line 1992 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2089 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -3667,7 +3762,7 @@
 
   case 146:
 /* Line 661 of lalr1.cc  */
-#line 2004 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2101 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -3675,7 +3770,7 @@
 
   case 147:
 /* Line 661 of lalr1.cc  */
-#line 2008 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2105 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -3685,7 +3780,7 @@
 
   case 148:
 /* Line 661 of lalr1.cc  */
-#line 2014 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2111 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -3693,7 +3788,7 @@
 
   case 149:
 /* Line 661 of lalr1.cc  */
-#line 2018 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2115 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -3704,7 +3799,7 @@
 
   case 150:
 /* Line 661 of lalr1.cc  */
-#line 2028 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2125 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -3718,7 +3813,7 @@
 
   case 151:
 /* Line 661 of lalr1.cc  */
-#line 2038 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2135 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -3732,7 +3827,7 @@
 
   case 152:
 /* Line 661 of lalr1.cc  */
-#line 2051 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2148 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -3742,7 +3837,7 @@
 
   case 153:
 /* Line 661 of lalr1.cc  */
-#line 2057 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2154 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3751,7 +3846,7 @@
 
   case 154:
 /* Line 661 of lalr1.cc  */
-#line 2066 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2163 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -3759,7 +3854,7 @@
 
   case 155:
 /* Line 661 of lalr1.cc  */
-#line 2071 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2168 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -3770,7 +3865,7 @@
 
   case 156:
 /* Line 661 of lalr1.cc  */
-#line 2078 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2175 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -3781,7 +3876,7 @@
 
   case 157:
 /* Line 661 of lalr1.cc  */
-#line 2085 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2182 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -3792,7 +3887,7 @@
 
   case 158:
 /* Line 661 of lalr1.cc  */
-#line 2097 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2194 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -3804,7 +3899,7 @@
 
   case 159:
 /* Line 661 of lalr1.cc  */
-#line 2107 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2204 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -3816,7 +3911,7 @@
 
   case 160:
 /* Line 661 of lalr1.cc  */
-#line 2117 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2214 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -3828,7 +3923,7 @@
 
   case 161:
 /* Line 661 of lalr1.cc  */
-#line 2128 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2225 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -3843,7 +3938,7 @@
 
   case 162:
 /* Line 661 of lalr1.cc  */
-#line 2144 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2241 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -3863,7 +3958,7 @@
 
   case 163:
 /* Line 661 of lalr1.cc  */
-#line 2164 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2261 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3871,7 +3966,7 @@
 
   case 164:
 /* Line 661 of lalr1.cc  */
-#line 2168 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2265 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3879,7 +3974,7 @@
 
   case 165:
 /* Line 661 of lalr1.cc  */
-#line 2172 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2269 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -3887,7 +3982,7 @@
 
   case 166:
 /* Line 661 of lalr1.cc  */
-#line 2180 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2277 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3895,7 +3990,7 @@
 
   case 167:
 /* Line 661 of lalr1.cc  */
-#line 2184 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2281 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3903,7 +3998,7 @@
 
   case 168:
 /* Line 661 of lalr1.cc  */
-#line 2188 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2285 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -3911,7 +4006,7 @@
 
   case 169:
 /* Line 661 of lalr1.cc  */
-#line 2196 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2293 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3919,7 +4014,7 @@
 
   case 170:
 /* Line 661 of lalr1.cc  */
-#line 2201 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2298 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -3931,7 +4026,7 @@
 
   case 171:
 /* Line 661 of lalr1.cc  */
-#line 2213 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2310 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -3941,7 +4036,7 @@
 
   case 172:
 /* Line 661 of lalr1.cc  */
-#line 2220 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2317 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -3953,7 +4048,7 @@
 
   case 173:
 /* Line 661 of lalr1.cc  */
-#line 2230 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2327 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr);
       (yyval.expr) = (yysemantic_stack_[(4) - (2)].expr);
@@ -3968,7 +4063,7 @@
 
   case 187:
 /* Line 661 of lalr1.cc  */
-#line 2263 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2360 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -3976,7 +4071,7 @@
 
   case 188:
 /* Line 661 of lalr1.cc  */
-#line 2271 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2368 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
 
@@ -4008,7 +4103,7 @@
 
   case 189:
 /* Line 661 of lalr1.cc  */
-#line 2303 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2400 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4016,7 +4111,7 @@
 
   case 190:
 /* Line 661 of lalr1.cc  */
-#line 2311 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2408 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4024,7 +4119,7 @@
 
   case 191:
 /* Line 661 of lalr1.cc  */
-#line 2319 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2416 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4034,7 +4129,7 @@
 
   case 192:
 /* Line 661 of lalr1.cc  */
-#line 2326 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2423 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4044,7 +4139,7 @@
 
   case 193:
 /* Line 661 of lalr1.cc  */
-#line 2333 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2430 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4055,7 +4150,7 @@
 
   case 194:
 /* Line 661 of lalr1.cc  */
-#line 2344 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2441 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4068,7 +4163,7 @@
 
   case 195:
 /* Line 661 of lalr1.cc  */
-#line 2353 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2450 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4081,7 +4176,7 @@
 
   case 196:
 /* Line 661 of lalr1.cc  */
-#line 2362 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2459 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4094,7 +4189,7 @@
 
   case 197:
 /* Line 661 of lalr1.cc  */
-#line 2371 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2468 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4107,7 +4202,7 @@
 
   case 198:
 /* Line 661 of lalr1.cc  */
-#line 2384 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2481 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
@@ -4115,7 +4210,7 @@
 
   case 199:
 /* Line 661 of lalr1.cc  */
-#line 2392 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2489 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4123,7 +4218,7 @@
 
   case 200:
 /* Line 661 of lalr1.cc  */
-#line 2400 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2497 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4131,7 +4226,7 @@
 
   case 201:
 /* Line 661 of lalr1.cc  */
-#line 2408 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2505 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4146,7 +4241,7 @@
 
   case 202:
 /* Line 661 of lalr1.cc  */
-#line 2423 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2520 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4154,7 +4249,7 @@
 
   case 203:
 /* Line 661 of lalr1.cc  */
-#line 2428 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2525 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4162,7 +4257,7 @@
 
   case 204:
 /* Line 661 of lalr1.cc  */
-#line 2436 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2533 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4176,7 +4271,7 @@
 
   case 205:
 /* Line 661 of lalr1.cc  */
-#line 2450 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2547 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4193,7 +4288,7 @@
 
   case 206:
 /* Line 661 of lalr1.cc  */
-#line 2467 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2564 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4218,7 +4313,7 @@
 
   case 207:
 /* Line 661 of lalr1.cc  */
-#line 2492 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2589 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4226,7 +4321,7 @@
 
   case 208:
 /* Line 661 of lalr1.cc  */
-#line 2500 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2597 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4236,7 +4331,7 @@
 
   case 209:
 /* Line 661 of lalr1.cc  */
-#line 2507 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2604 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4247,7 +4342,7 @@
 
   case 210:
 /* Line 661 of lalr1.cc  */
-#line 2518 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2615 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
        delete (yysemantic_stack_[(3) - (2)].name_test_list);
@@ -4256,7 +4351,7 @@
 
   case 211:
 /* Line 661 of lalr1.cc  */
-#line 2527 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2624 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4264,7 +4359,7 @@
 
   case 212:
 /* Line 661 of lalr1.cc  */
-#line 2535 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2632 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4272,7 +4367,7 @@
 
   case 213:
 /* Line 661 of lalr1.cc  */
-#line 2540 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2637 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4287,7 +4382,7 @@
 
   case 214:
 /* Line 661 of lalr1.cc  */
-#line 2553 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2650 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr);
       (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr);
@@ -4304,7 +4399,7 @@
 
   case 233:
 /* Line 661 of lalr1.cc  */
-#line 2600 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2697 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4318,7 +4413,7 @@
 
   case 234:
 /* Line 661 of lalr1.cc  */
-#line 2614 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2711 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4326,14 +4421,14 @@
 
   case 236:
 /* Line 661 of lalr1.cc  */
-#line 2626 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2723 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
     }
     break;
 
   case 237:
 /* Line 661 of lalr1.cc  */
-#line 2633 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2730 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4341,7 +4436,7 @@
 
   case 238:
 /* Line 661 of lalr1.cc  */
-#line 2638 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2735 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4349,7 +4444,7 @@
 
   case 239:
 /* Line 661 of lalr1.cc  */
-#line 2646 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2743 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4357,7 +4452,7 @@
 
   case 240:
 /* Line 661 of lalr1.cc  */
-#line 2651 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2748 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -4365,7 +4460,7 @@
 
   case 241:
 /* Line 661 of lalr1.cc  */
-#line 2656 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2753 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -4373,7 +4468,7 @@
 
   case 242:
 /* Line 661 of lalr1.cc  */
-#line 2664 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2761 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -4385,7 +4480,7 @@
 
   case 243:
 /* Line 661 of lalr1.cc  */
-#line 2673 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2770 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -4397,7 +4492,7 @@
 
   case 244:
 /* Line 661 of lalr1.cc  */
-#line 2685 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2782 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -4411,7 +4506,7 @@
 
   case 245:
 /* Line 661 of lalr1.cc  */
-#line 2695 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2792 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -4424,7 +4519,7 @@
 
   case 246:
 /* Line 661 of lalr1.cc  */
-#line 2708 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2805 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4432,7 +4527,7 @@
 
   case 255:
 /* Line 661 of lalr1.cc  */
-#line 2732 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2829 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4442,7 +4537,7 @@
 
   case 256:
 /* Line 661 of lalr1.cc  */
-#line 2739 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2836 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       FLWORClauseList *fcl = dynamic_cast<FLWORClauseList*>((yysemantic_stack_[(2) - (1)].node));
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -4452,7 +4547,7 @@
 
   case 257:
 /* Line 661 of lalr1.cc  */
-#line 2749 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2846 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -4460,7 +4555,7 @@
 
   case 258:
 /* Line 661 of lalr1.cc  */
-#line 2754 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2851 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -4472,7 +4567,7 @@
 
   case 259:
 /* Line 661 of lalr1.cc  */
-#line 2763 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2860 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -4484,7 +4579,7 @@
 
   case 260:
 /* Line 661 of lalr1.cc  */
-#line 2772 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2869 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = NULL;
       error((yylocation_stack_[(2) - (2)]), "");
@@ -4494,7 +4589,7 @@
 
   case 262:
 /* Line 661 of lalr1.cc  */
-#line 2786 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2883 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
 
     }
@@ -4502,7 +4597,7 @@
 
   case 263:
 /* Line 661 of lalr1.cc  */
-#line 2794 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2891 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4512,7 +4607,7 @@
 
   case 264:
 /* Line 661 of lalr1.cc  */
-#line 2801 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2898 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       if ( VarInDeclList* vdl = dynamic_cast<VarInDeclList*>((yysemantic_stack_[(4) - (1)].node)) )
         vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -4522,7 +4617,7 @@
 
   case 265:
 /* Line 661 of lalr1.cc  */
-#line 2809 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2906 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -4534,7 +4629,7 @@
 
   case 266:
 /* Line 661 of lalr1.cc  */
-#line 2821 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2918 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -4548,7 +4643,7 @@
 
   case 267:
 /* Line 661 of lalr1.cc  */
-#line 2831 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4562,7 +4657,7 @@
 
   case 268:
 /* Line 661 of lalr1.cc  */
-#line 2841 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2938 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4576,7 +4671,7 @@
 
   case 269:
 /* Line 661 of lalr1.cc  */
-#line 2851 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4590,7 +4685,7 @@
 
   case 270:
 /* Line 661 of lalr1.cc  */
-#line 2861 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2958 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4604,7 +4699,7 @@
 
   case 271:
 /* Line 661 of lalr1.cc  */
-#line 2871 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2968 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4618,7 +4713,7 @@
 
   case 272:
 /* Line 661 of lalr1.cc  */
-#line 2881 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2978 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4632,7 +4727,7 @@
 
   case 273:
 /* Line 661 of lalr1.cc  */
-#line 2891 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2988 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -4646,7 +4741,7 @@
 
   case 274:
 /* Line 661 of lalr1.cc  */
-#line 2902 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 2999 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4659,7 +4754,7 @@
 
   case 275:
 /* Line 661 of lalr1.cc  */
-#line 2911 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3008 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4673,7 +4768,7 @@
 
   case 276:
 /* Line 661 of lalr1.cc  */
-#line 2921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3018 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4687,7 +4782,7 @@
 
   case 277:
 /* Line 661 of lalr1.cc  */
-#line 2931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3028 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4701,7 +4796,7 @@
 
   case 278:
 /* Line 661 of lalr1.cc  */
-#line 2947 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3044 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4709,7 +4804,7 @@
 
   case 279:
 /* Line 661 of lalr1.cc  */
-#line 2956 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3053 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4717,7 +4812,7 @@
 
   case 280:
 /* Line 661 of lalr1.cc  */
-#line 2965 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3062 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
@@ -4725,7 +4820,7 @@
 
   case 281:
 /* Line 661 of lalr1.cc  */
-#line 2973 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3070 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4735,7 +4830,7 @@
 
   case 282:
 /* Line 661 of lalr1.cc  */
-#line 2979 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3076 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             if( VarGetsDeclList *vgdl = dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(3) - (1)].node)) )
                 vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -4745,7 +4840,7 @@
 
   case 283:
 /* Line 661 of lalr1.cc  */
-#line 2991 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3088 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4757,7 +4852,7 @@
 
   case 284:
 /* Line 661 of lalr1.cc  */
-#line 2999 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3096 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4769,7 +4864,7 @@
 
   case 285:
 /* Line 661 of lalr1.cc  */
-#line 3009 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3106 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -4781,7 +4876,7 @@
 
   case 286:
 /* Line 661 of lalr1.cc  */
-#line 3017 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3114 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -4793,7 +4888,7 @@
 
   case 287:
 /* Line 661 of lalr1.cc  */
-#line 3029 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3126 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4803,7 +4898,7 @@
 
   case 288:
 /* Line 661 of lalr1.cc  */
-#line 3035 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3132 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4814,7 +4909,7 @@
 
   case 290:
 /* Line 661 of lalr1.cc  */
-#line 3048 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3145 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
@@ -4822,7 +4917,7 @@
 
   case 291:
 /* Line 661 of lalr1.cc  */
-#line 3052 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3149 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_curr(static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)));
@@ -4831,7 +4926,7 @@
 
   case 292:
 /* Line 661 of lalr1.cc  */
-#line 3060 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3157 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
@@ -4839,7 +4934,7 @@
 
   case 293:
 /* Line 661 of lalr1.cc  */
-#line 3064 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3161 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_posvar(dynamic_cast<PositionalVar*>((yysemantic_stack_[(2) - (1)].node)));
@@ -4848,7 +4943,7 @@
 
   case 295:
 /* Line 661 of lalr1.cc  */
-#line 3073 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3170 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), static_cast<QName*>((yysemantic_stack_[(6) - (6)].expr)));
     }
@@ -4856,7 +4951,7 @@
 
   case 296:
 /* Line 661 of lalr1.cc  */
-#line 3077 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3174 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4864,7 +4959,7 @@
 
   case 297:
 /* Line 661 of lalr1.cc  */
-#line 3081 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3178 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
@@ -4872,7 +4967,7 @@
 
   case 298:
 /* Line 661 of lalr1.cc  */
-#line 3091 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3188 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -4880,7 +4975,7 @@
 
   case 299:
 /* Line 661 of lalr1.cc  */
-#line 3099 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3196 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -4888,7 +4983,7 @@
 
   case 300:
 /* Line 661 of lalr1.cc  */
-#line 3106 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3203 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4898,7 +4993,7 @@
 
   case 301:
 /* Line 661 of lalr1.cc  */
-#line 3112 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3209 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       GroupSpecList* gsl = static_cast<GroupSpecList*>((yysemantic_stack_[(3) - (1)].node));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(3) - (3)].node)));
@@ -4908,7 +5003,7 @@
 
   case 302:
 /* Line 661 of lalr1.cc  */
-#line 3122 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3219 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)), NULL, (yysemantic_stack_[(4) - (4)].expr), NULL);
     }
@@ -4916,7 +5011,7 @@
 
   case 303:
 /* Line 661 of lalr1.cc  */
-#line 3126 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3223 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4928,7 +5023,7 @@
 
   case 304:
 /* Line 661 of lalr1.cc  */
-#line 3134 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3231 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -4940,7 +5035,7 @@
 
   case 305:
 /* Line 661 of lalr1.cc  */
-#line 3142 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3239 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4952,7 +5047,7 @@
 
   case 306:
 /* Line 661 of lalr1.cc  */
-#line 3150 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3247 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarRef* varRef = dynamic_cast<VarRef*>((yysemantic_stack_[(1) - (1)].expr));
       if (varRef != NULL)
@@ -4964,7 +5059,7 @@
 
   case 307:
 /* Line 661 of lalr1.cc  */
-#line 3158 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3255 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       VarRef* varRef = dynamic_cast<VarRef*>((yysemantic_stack_[(2) - (1)].expr));
       if (varRef != NULL)
@@ -4976,7 +5071,7 @@
 
   case 308:
 /* Line 661 of lalr1.cc  */
-#line 3170 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3267 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -4984,7 +5079,7 @@
 
   case 309:
 /* Line 661 of lalr1.cc  */
-#line 3178 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3275 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -4994,7 +5089,7 @@
 
   case 310:
 /* Line 661 of lalr1.cc  */
-#line 3184 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3281 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5004,7 +5099,7 @@
 
   case 311:
 /* Line 661 of lalr1.cc  */
-#line 3194 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3291 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5014,7 +5109,7 @@
 
   case 312:
 /* Line 661 of lalr1.cc  */
-#line 3200 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3297 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             if ( OrderSpecList* osl = dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (1)].node)) )
                 osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5024,7 +5119,7 @@
 
   case 313:
 /* Line 661 of lalr1.cc  */
-#line 3210 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3307 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5032,7 +5127,7 @@
 
   case 314:
 /* Line 661 of lalr1.cc  */
-#line 3214 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3311 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderSpec(
                 LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<OrderModifierPN*>((yysemantic_stack_[(2) - (2)].node))
@@ -5042,7 +5137,7 @@
 
   case 315:
 /* Line 661 of lalr1.cc  */
-#line 3224 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3321 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5052,7 +5147,7 @@
 
   case 316:
 /* Line 661 of lalr1.cc  */
-#line 3230 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3327 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5062,7 +5157,7 @@
 
   case 317:
 /* Line 661 of lalr1.cc  */
-#line 3236 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3333 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5072,7 +5167,7 @@
 
   case 318:
 /* Line 661 of lalr1.cc  */
-#line 3242 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3339 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5085,7 +5180,7 @@
 
   case 319:
 /* Line 661 of lalr1.cc  */
-#line 3251 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3348 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5098,7 +5193,7 @@
 
   case 320:
 /* Line 661 of lalr1.cc  */
-#line 3260 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3357 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5111,7 +5206,7 @@
 
   case 321:
 /* Line 661 of lalr1.cc  */
-#line 3269 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3366 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5124,7 +5219,7 @@
 
   case 322:
 /* Line 661 of lalr1.cc  */
-#line 3282 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3379 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5132,7 +5227,7 @@
 
   case 323:
 /* Line 661 of lalr1.cc  */
-#line 3286 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3383 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5140,7 +5235,7 @@
 
   case 324:
 /* Line 661 of lalr1.cc  */
-#line 3294 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3391 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5150,7 +5245,7 @@
 
   case 325:
 /* Line 661 of lalr1.cc  */
-#line 3300 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3397 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5160,7 +5255,7 @@
 
   case 326:
 /* Line 661 of lalr1.cc  */
-#line 3310 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3407 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5168,7 +5263,7 @@
 
   case 327:
 /* Line 661 of lalr1.cc  */
-#line 3318 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3415 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5181,7 +5276,7 @@
 
   case 328:
 /* Line 661 of lalr1.cc  */
-#line 3327 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3424 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5194,7 +5289,7 @@
 
   case 329:
 /* Line 661 of lalr1.cc  */
-#line 3340 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3437 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5205,7 +5300,7 @@
 
   case 330:
 /* Line 661 of lalr1.cc  */
-#line 3347 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3444 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       QVarInDeclList *qvidl = dynamic_cast<QVarInDeclList*>((yysemantic_stack_[(4) - (1)].node));
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5215,7 +5310,7 @@
 
   case 331:
 /* Line 661 of lalr1.cc  */
-#line 3359 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3456 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -5223,7 +5318,7 @@
 
   case 332:
 /* Line 661 of lalr1.cc  */
-#line 3363 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3460 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5234,7 +5329,7 @@
 
   case 333:
 /* Line 661 of lalr1.cc  */
-#line 3375 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3472 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
@@ -5242,7 +5337,7 @@
 
   case 334:
 /* Line 661 of lalr1.cc  */
-#line 3382 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3479 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5252,7 +5347,7 @@
 
   case 335:
 /* Line 661 of lalr1.cc  */
-#line 3388 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3485 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -5262,7 +5357,7 @@
 
   case 336:
 /* Line 661 of lalr1.cc  */
-#line 3397 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3494 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -5270,7 +5365,7 @@
 
   case 337:
 /* Line 661 of lalr1.cc  */
-#line 3404 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3501 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5280,7 +5375,7 @@
 
   case 338:
 /* Line 661 of lalr1.cc  */
-#line 3410 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3507 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = static_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node));
       sco_list_p->push_back((yysemantic_stack_[(3) - (3)].expr));
@@ -5290,7 +5385,7 @@
 
   case 339:
 /* Line 661 of lalr1.cc  */
-#line 3421 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3518 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
@@ -5298,7 +5393,7 @@
 
   case 340:
 /* Line 661 of lalr1.cc  */
-#line 3428 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3525 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5308,7 +5403,7 @@
 
   case 341:
 /* Line 661 of lalr1.cc  */
-#line 3434 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3531 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -5318,7 +5413,7 @@
 
   case 342:
 /* Line 661 of lalr1.cc  */
-#line 3443 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3540 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -5326,7 +5421,7 @@
 
   case 343:
 /* Line 661 of lalr1.cc  */
-#line 3452 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3549 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5337,7 +5432,7 @@
 
   case 344:
 /* Line 661 of lalr1.cc  */
-#line 3459 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3556 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -5349,7 +5444,7 @@
 
   case 345:
 /* Line 661 of lalr1.cc  */
-#line 3470 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3567 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5360,7 +5455,7 @@
 
   case 346:
 /* Line 661 of lalr1.cc  */
-#line 3477 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3574 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -5372,7 +5467,7 @@
 
   case 347:
 /* Line 661 of lalr1.cc  */
-#line 3489 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3586 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5382,7 +5477,7 @@
 
   case 348:
 /* Line 661 of lalr1.cc  */
-#line 3495 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3592 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -5392,7 +5487,7 @@
 
   case 349:
 /* Line 661 of lalr1.cc  */
-#line 3507 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3604 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5402,7 +5497,7 @@
 
   case 350:
 /* Line 661 of lalr1.cc  */
-#line 3513 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3610 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -5413,7 +5508,7 @@
 
   case 351:
 /* Line 661 of lalr1.cc  */
-#line 3524 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3621 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5423,7 +5518,7 @@
 
   case 352:
 /* Line 661 of lalr1.cc  */
-#line 3530 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3627 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       CaseClauseList* cc_list_p = static_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -5433,7 +5528,7 @@
 
   case 353:
 /* Line 661 of lalr1.cc  */
-#line 3541 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3638 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5443,7 +5538,7 @@
 
   case 354:
 /* Line 661 of lalr1.cc  */
-#line 3547 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3644 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -5454,7 +5549,7 @@
 
   case 355:
 /* Line 661 of lalr1.cc  */
-#line 3558 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3655 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5464,7 +5559,7 @@
 
   case 356:
 /* Line 661 of lalr1.cc  */
-#line 3564 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3661 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = static_cast<SequenceTypeList*>((yysemantic_stack_[(3) - (1)].node));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)));
@@ -5474,7 +5569,7 @@
 
   case 357:
 /* Line 661 of lalr1.cc  */
-#line 3575 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3672 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new IfExpr(LOC ((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (6)].expr), (yysemantic_stack_[(8) - (8)].expr));
     }
@@ -5482,7 +5577,7 @@
 
   case 358:
 /* Line 661 of lalr1.cc  */
-#line 3584 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3681 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -5490,7 +5585,7 @@
 
   case 359:
 /* Line 661 of lalr1.cc  */
-#line 3588 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+#line 3685 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
@@ -5498,7 +5593,7 @@