zorba-coders team mailing list archive

Thread
Date

[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba

To: mp+211150@xxxxxxxxxxxxxxxxxx
From: "Paul J. Lucas" <paul@xxxxxxxxxxxxx>
Date: Fri, 14 Mar 2014 22:39:21 -0000
Reply-to: mp+211150@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Now allowing empty $content.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150

Now allowing empty $content.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/211150
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2014-03-12 23:14:08 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2014-03-14 22:38:42 +0000
@@ -35,11 +35,11 @@
 
 /* First part of user declarations.  */
 /* Line 278 of lalr1.cc  */
-#line 1 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 
 #define JSONIQ_PARSER
 /* Line 278 of lalr1.cc  */
-#line 59 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 59 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 
 
 #include "common/common.h"
@@ -76,7 +76,7 @@
 using namespace zorba;
 
 /* Line 278 of lalr1.cc  */
-#line 102 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 102 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 
 
 #ifdef XQUERY_PARSER
@@ -94,14 +94,14 @@
 
 
 /* Line 278 of lalr1.cc  */
-#line 98 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 98 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 #include "jsoniq_parser.hpp"
 
 /* User implementation prologue.  */
 /* Line 284 of lalr1.cc  */
-#line 905 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 905 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 
 
 
@@ -112,7 +112,7 @@
     }
 }
 /* Line 284 of lalr1.cc  */
-#line 1043 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1043 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 
 namespace {
 bool convert_postfix_to_target_and_selector(
@@ -208,7 +208,7 @@
 }
 
 /* Line 284 of lalr1.cc  */
-#line 212 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 212 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 # ifndef YY_NULL
@@ -303,7 +303,7 @@
 
 namespace zorba {
 /* Line 352 of lalr1.cc  */
-#line 307 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 307 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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
@@ -406,2005 +406,2005 @@
       {
         case 111: /* "'DECIMAL'" */
 /* Line 453 of lalr1.cc  */
-#line 903 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 903 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).decval); };
 /* Line 453 of lalr1.cc  */
-#line 413 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 413 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 126: /* "'DOUBLE'" */
 /* Line 453 of lalr1.cc  */
-#line 902 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 902 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).dval); };
 /* Line 453 of lalr1.cc  */
-#line 420 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 420 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 151: /* "'INTEGER'" */
 /* Line 453 of lalr1.cc  */
-#line 901 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 901 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).ival); };
 /* Line 453 of lalr1.cc  */
-#line 427 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 427 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 344: /* VersionDecl */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 434 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 434 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 345: /* MainModule */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 441 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 441 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* LibraryModule */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 448 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 448 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 347: /* ModuleDecl */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 455 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 455 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 348: /* SIND_DeclList */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 462 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 462 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 349: /* SIND_Decl */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 469 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 469 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 350: /* Setter */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 476 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 476 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 351: /* BoundarySpaceDecl */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 483 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 483 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 352: /* DefaultCollationDecl */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 490 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 490 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 353: /* BaseURIDecl */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 497 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 497 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 354: /* ConstructionDecl */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 504 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 355: /* OrderingModeDecl */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 511 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 511 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 356: /* EmptyOrderDecl */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 518 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 518 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 357: /* CopyNamespacesDecl */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 525 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 525 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 358: /* Import */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 532 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 532 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 359: /* SchemaImport */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 539 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 539 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 360: /* URILiteralList */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 546 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 546 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 361: /* SchemaPrefix */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 553 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 553 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 362: /* ModuleImport */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 560 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 560 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 363: /* NamespaceDecl */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 567 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 567 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 364: /* DefaultNamespaceDecl */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 574 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 574 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 365: /* VFO_DeclList */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 581 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 581 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 366: /* VFO_Decl */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 588 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 588 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 367: /* DecimalFormatDecl */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 595 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 595 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 368: /* DecimalFormatParamList */
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).vstrpair); };
 /* Line 453 of lalr1.cc  */
-#line 602 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 602 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 369: /* DecimalFormatParam */
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).strpair); };
 /* Line 453 of lalr1.cc  */
-#line 609 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 609 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 371: /* OptionDecl */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 616 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 616 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 372: /* FTOptionDecl */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 623 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 623 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* CtxItemDecl */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 630 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 630 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 374: /* CtxItemDecl2 */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 637 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 637 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 375: /* CtxItemDecl3 */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 644 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 644 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 376: /* CtxItemDecl4 */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 651 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 651 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 377: /* VarDecl */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 658 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 658 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 378: /* VarNameAndType */
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).varnametype); };
 /* Line 453 of lalr1.cc  */
-#line 665 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 665 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 379: /* AnnotationList */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 672 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 672 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 380: /* Annotation */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 679 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 679 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* AnnotationLiteralList */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 686 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 686 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 382: /* FunctionDecl */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 693 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 693 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 383: /* FunctionDecl2 */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 700 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 700 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 384: /* FunctionDeclSimple */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 707 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 707 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 385: /* FunctionDeclUpdating */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 714 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 714 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 386: /* FunctionSig */
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).fnsig); };
 /* Line 453 of lalr1.cc  */
-#line 721 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 721 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 387: /* ParamList */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 728 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 728 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 388: /* Param */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 735 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 735 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* CollectionDecl */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 742 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 742 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 391: /* IndexDecl */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 749 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 749 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 392: /* IndexKeyList */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 756 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 756 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 393: /* IndexKeySpec */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 763 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 763 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 394: /* IntegrityConstraintDecl */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 770 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 770 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 395: /* QueryBody */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 777 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 777 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 396: /* StatementsAndOptionalExprTop */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 784 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 784 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 397: /* StatementsAndOptionalExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 791 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 791 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 398: /* StatementsAndExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 798 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 798 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 399: /* Statements */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 805 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 805 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 400: /* Statement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 812 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 812 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 401: /* BlockStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 819 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 819 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 402: /* BlockExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 826 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 826 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 403: /* EnclosedStatementsAndOptionalExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 833 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 833 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 404: /* VarDeclStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 840 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 840 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 407: /* AssignStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 847 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 847 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 408: /* ApplyStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 854 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 854 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 409: /* ExitStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 861 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 861 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 410: /* WhileStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 868 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 868 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 411: /* FlowCtlStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 875 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 875 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 412: /* FLWORStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 882 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 882 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 413: /* ReturnStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 889 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 889 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 414: /* IfStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 896 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 896 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 415: /* TryStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 903 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 903 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 416: /* CatchListStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 910 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 910 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 417: /* CatchStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 917 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 917 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 418: /* VoidStatement */
 /* Line 453 of lalr1.cc  */
-#line 933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 419: /* Expr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 420: /* ExprSingle */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 938 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 938 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 421: /* ExprSimple */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 945 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 945 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 422: /* FLWORExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 423: /* ReturnExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 959 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 959 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 427: /* FLWORWinCond */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 966 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 966 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 428: /* WindowClause */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 973 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 973 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 429: /* CountClause */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 980 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 980 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 430: /* ForLetWinClause */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 987 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 987 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 432: /* FLWORClauseList */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 994 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 994 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 433: /* ForClause */
 /* Line 453 of lalr1.cc  */
-#line 924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1001 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1001 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 435: /* VarInDeclList */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1008 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1008 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 436: /* VarInDecl */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1015 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1015 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 437: /* PositionalVar */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1022 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1022 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 438: /* FTScoreVar */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1029 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1029 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 439: /* LetClause */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1036 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1036 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 440: /* VarGetsDeclList */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1043 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1043 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 441: /* VarGetsDecl */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1050 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1050 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 442: /* WindowVarDecl */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1057 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1057 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 443: /* WindowVars */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1064 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1064 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 444: /* WindowVars3 */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1071 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1071 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 445: /* WindowVars2 */
 /* Line 453 of lalr1.cc  */
-#line 931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1078 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1078 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 446: /* WhereClause */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1085 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1085 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 447: /* GroupByClause */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1092 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1092 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 448: /* GroupSpecList */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1099 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1099 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 449: /* GroupSpec */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1106 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1106 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 450: /* GroupCollationSpec */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1113 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1113 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 451: /* OrderByClause */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1120 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1120 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 452: /* OrderSpecList */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1127 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1127 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 453: /* OrderSpec */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1134 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1134 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 454: /* OrderModifier */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1141 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1141 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 455: /* OrderDirSpec */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1148 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1148 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 456: /* OrderEmptySpec */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1155 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1155 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 457: /* OrderCollationSpec */
 /* Line 453 of lalr1.cc  */
-#line 926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1162 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1162 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 458: /* QuantifiedExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1169 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1169 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 459: /* QVarInDeclList */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1176 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1176 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 460: /* QVarInDecl */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1183 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1183 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 461: /* SwitchExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1190 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1190 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 462: /* SwitchCaseClauseList */
 /* Line 453 of lalr1.cc  */
-#line 933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1197 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1197 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 463: /* SwitchCaseClause */
 /* Line 453 of lalr1.cc  */
-#line 933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1204 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1204 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 464: /* SwitchCaseOperandList */
 /* Line 453 of lalr1.cc  */
-#line 933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1211 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1211 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 465: /* SwitchStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1218 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1218 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 468: /* TypeswitchExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1225 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1225 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 469: /* TypeswitchStatement */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1232 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1232 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 470: /* CaseClauseList */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1239 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1239 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 471: /* CaseClause */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1246 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1246 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 474: /* SequenceTypeList */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1253 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1253 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 475: /* IfExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1260 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1260 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 476: /* OrExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1267 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1267 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 477: /* AndExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1274 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1274 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 478: /* NotExpr */
 /* Line 453 of lalr1.cc  */
-#line 936 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 936 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1281 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1281 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 479: /* ComparisonExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1288 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1288 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 481: /* FTContainsExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1295 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1295 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 482: /* StringConcatExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1302 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1302 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 483: /* opt_FTIgnoreOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1309 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1309 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 484: /* RangeExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1316 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1316 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 485: /* AdditiveExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1323 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1323 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 486: /* MultiplicativeExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1330 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1330 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 487: /* UnionExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1337 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1337 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 488: /* IntersectExceptExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1344 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1344 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 489: /* InstanceofExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1351 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1351 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 490: /* TreatExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1358 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1358 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 491: /* CastableExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1365 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1365 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 492: /* CastExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1372 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1372 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 493: /* SingleType */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1379 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1379 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 494: /* UnaryExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1386 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1386 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 495: /* SignList */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1393 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1393 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 496: /* ValueExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1400 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1400 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 497: /* SimpleMapExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1407 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1407 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 498: /* ValueComp */
 /* Line 453 of lalr1.cc  */
-#line 930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1414 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1414 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 499: /* NodeComp */
 /* Line 453 of lalr1.cc  */
-#line 933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1421 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1421 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 500: /* ValidateExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1428 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1428 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 501: /* ExtensionExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1435 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1435 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 502: /* Pragma_list */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1442 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1442 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 503: /* Pragma */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1449 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1449 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 504: /* PathExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1456 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1456 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 506: /* RelativePathExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1463 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1463 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 507: /* StepExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1470 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1470 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 508: /* AxisStep */
 /* Line 453 of lalr1.cc  */
-#line 946 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 946 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1477 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1477 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 509: /* ForwardStep */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1484 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1484 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 510: /* ForwardAxis */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1491 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1491 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 511: /* AbbrevForwardStep */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1498 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1498 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 512: /* ReverseStep */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1505 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1505 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 513: /* ReverseAxis */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1512 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1512 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 514: /* NodeTest */
 /* Line 453 of lalr1.cc  */
-#line 918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1519 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1519 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 515: /* NameTest */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1526 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1526 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 516: /* Wildcard */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1533 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1533 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 517: /* PostfixExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1540 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1540 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 518: /* PredicateList */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1547 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1547 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 519: /* Predicate */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1554 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1554 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 520: /* PrimaryExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1561 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1561 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 521: /* Literal */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1568 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1568 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 522: /* NumericLiteral */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1575 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1575 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 523: /* VarRef */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1582 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1582 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 524: /* ParenthesizedExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1589 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1589 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 525: /* ContextItemExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1596 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1596 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 526: /* OrderedExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1603 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1603 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 527: /* UnorderedExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1610 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1610 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 528: /* FunctionCall */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1617 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1617 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 529: /* ArgList */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1624 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1624 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 533: /* Constructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1631 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1631 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 534: /* DirectConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1638 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1638 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 535: /* DirElemConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1645 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1645 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 536: /* DirElemContentList */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1652 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1652 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 537: /* DirAttributeList */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1659 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1659 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 538: /* DirAttr */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1666 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1666 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 540: /* DirAttributeValue */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1673 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1673 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 541: /* opt_QuoteAttrContentList */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1680 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1680 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 542: /* QuoteAttrContentList */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1687 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1687 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 543: /* opt_AposAttrContentList */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1694 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1694 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 544: /* AposAttrContentList */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1701 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1701 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 545: /* QuoteAttrValueContent */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1708 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1708 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 546: /* AposAttrValueContent */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1715 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1715 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 547: /* DirElemContent */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1722 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1722 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 548: /* CommonContent */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1729 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1729 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 549: /* DirCommentConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1736 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1736 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 550: /* DirPIConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1743 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1743 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 551: /* CDataSection */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1750 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1750 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 552: /* ComputedConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1757 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1757 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 553: /* CompDocConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1764 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1764 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 554: /* CompElemConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1771 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1771 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 555: /* CompAttrConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1778 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1778 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 556: /* CompTextConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1785 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1785 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 557: /* CompCommentConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1792 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1792 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 558: /* CompPIConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1799 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1799 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 559: /* CompNamespaceConstructor */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1806 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1806 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 560: /* TypeDeclaration */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1813 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1813 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 561: /* SequenceType */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1820 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1820 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 562: /* OccurrenceIndicator */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1827 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1827 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 563: /* ItemType */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1834 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1834 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 564: /* TypeList */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1841 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1841 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 565: /* GeneralizedAtomicType */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1848 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1848 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 566: /* SimpleType */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1855 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1855 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 567: /* KindTest */
 /* Line 453 of lalr1.cc  */
-#line 925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1862 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1862 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 568: /* AnyKindTest */
 /* Line 453 of lalr1.cc  */
-#line 921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1869 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1869 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 570: /* DocumentTest */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1876 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1876 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 571: /* NamespaceTest */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1883 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1883 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 572: /* TextTest */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1890 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1890 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 573: /* CommentTest */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1897 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1897 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 574: /* PITest */
 /* Line 453 of lalr1.cc  */
-#line 927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1904 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1904 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 575: /* AttributeTest */
 /* Line 453 of lalr1.cc  */
-#line 922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1911 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1911 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 576: /* SchemaAttributeTest */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 577: /* ElementTest */
 /* Line 453 of lalr1.cc  */
-#line 923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 578: /* SchemaElementTest */
 /* Line 453 of lalr1.cc  */
-#line 928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 579: /* TypeName */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1939 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1939 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 580: /* TypeName_WITH_HOOK */
 /* Line 453 of lalr1.cc  */
-#line 929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1946 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1946 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 581: /* StringLiteral */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1953 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1953 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 583: /* AnyFunctionTest */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1960 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1960 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 584: /* TypedFunctionTest */
 /* Line 453 of lalr1.cc  */
-#line 932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 1967 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1967 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 587: /* InsertExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1974 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1974 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 588: /* DeleteExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1981 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1981 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 589: /* ReplaceExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1988 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1988 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* RenameExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 1995 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1995 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 591: /* TransformExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2002 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2002 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 592: /* VarNameList */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2009 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2009 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 593: /* VarNameDecl */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2016 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2016 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 594: /* TryExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2023 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2023 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 595: /* CatchListExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2030 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2030 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 596: /* CatchExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2037 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2037 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 597: /* BracedExpr */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2044 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2044 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 598: /* NameTestList */
 /* Line 453 of lalr1.cc  */
-#line 952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete ((*yyvaluep).name_test_list); };
 /* Line 453 of lalr1.cc  */
-#line 2051 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2051 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 599: /* FTSelection */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2058 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2058 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 602: /* FTOr */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2065 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2065 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 603: /* FTAnd */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2072 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2072 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 604: /* FTMildNot */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2079 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2079 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 605: /* FTUnaryNot */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2086 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2086 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 606: /* FTPrimaryWithOptions */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2093 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2093 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 607: /* opt_FTMatchOptions */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2100 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2100 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 609: /* FTWeight */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2107 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2107 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 610: /* FTPrimary */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2114 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2114 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 611: /* opt_FTTimes */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2121 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2121 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 612: /* FTExtensionSelection */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2128 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2128 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 614: /* FTWords */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2135 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2135 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 615: /* FTWordsValue */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2142 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2142 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 617: /* FTAnyallOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2149 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2149 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 620: /* FTPosFilter */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2156 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2156 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 621: /* FTOrder */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2163 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2163 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 622: /* FTWindow */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2170 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2170 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 623: /* FTDistance */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2177 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2177 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 624: /* FTUnit */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2184 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2184 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 625: /* FTMatchOptions */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2191 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2191 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 626: /* FTMatchOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2198 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2198 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 627: /* FTCaseOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2205 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2205 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 628: /* FTDiacriticsOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2212 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2212 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 629: /* FTExtensionOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2219 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2219 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 630: /* FTStemOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2226 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2226 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 631: /* FTThesaurusOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2233 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2233 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 635: /* FTThesaurusID */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2240 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2240 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 638: /* FTStopWordOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2247 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2247 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 639: /* FTStopWords */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2254 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2254 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 643: /* FTStopWordsInclExcl */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2261 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2261 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 644: /* FTLanguageOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2268 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2268 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 645: /* FTWildCardOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2275 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2275 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 646: /* FTContent */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2282 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2282 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 647: /* FTTimes */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2289 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2289 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 648: /* FTRange */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2296 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2296 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 649: /* FTScope */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2303 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2303 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 650: /* FTBigUnit */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2310 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2310 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 651: /* FTIgnoreOption */
 /* Line 453 of lalr1.cc  */
-#line 940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2317 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2317 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 652: /* JSONArrayConstructor */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2324 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2324 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 653: /* JSONSimpleObjectUnion */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2331 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2331 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 654: /* JSONAccumulatorObjectUnion */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2338 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2338 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 655: /* JSONObjectConstructor */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2345 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2345 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 656: /* JSONPairList */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).node) ); };
 /* Line 453 of lalr1.cc  */
-#line 2352 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2352 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 657: /* JSONInsertExpr */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2359 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2359 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 658: /* JSONAppendExpr */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2366 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2366 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 659: /* JSONDeleteExpr */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2373 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2373 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 660: /* JSONRenameExpr */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2380 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2380 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 661: /* JSONReplaceExpr */
 /* Line 453 of lalr1.cc  */
-#line 943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2387 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2387 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 664: /* QNAME */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2394 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2394 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 665: /* FUNCTION_NAME */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2401 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2401 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 666: /* EQNAME */
 /* Line 453 of lalr1.cc  */
-#line 949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( ((*yyvaluep).expr) ); };
 /* Line 453 of lalr1.cc  */
-#line 2408 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2408 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
 
 	default:
@@ -2495,12 +2495,12 @@
 
 /* User initialization code.  */
 /* Line 543 of lalr1.cc  */
-#line 141 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 141 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 /* Line 543 of lalr1.cc  */
-#line 2504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2504 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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
@@ -2617,7 +2617,7 @@
       {
 	  case 3:
 /* Line 661 of lalr1.cc  */
-#line 1150 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1150 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2625,7 +2625,7 @@
 
   case 4:
 /* Line 661 of lalr1.cc  */
-#line 1154 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1154 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2633,7 +2633,7 @@
 
   case 5:
 /* Line 661 of lalr1.cc  */
-#line 1158 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1158 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -2641,7 +2641,7 @@
 
   case 6:
 /* Line 661 of lalr1.cc  */
-#line 1166 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1166 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL;
       }
@@ -2649,7 +2649,7 @@
 
   case 7:
 /* Line 661 of lalr1.cc  */
-#line 1172 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1172 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -2657,7 +2657,7 @@
 
   case 8:
 /* Line 661 of lalr1.cc  */
-#line 1176 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1176 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -2665,7 +2665,7 @@
 
   case 9:
 /* Line 661 of lalr1.cc  */
-#line 1185 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1185 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -2674,7 +2674,7 @@
 
   case 10:
 /* Line 661 of lalr1.cc  */
-#line 1191 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1191 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -2685,7 +2685,7 @@
 
   case 11:
 /* Line 661 of lalr1.cc  */
-#line 1199 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1199 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -2694,7 +2694,7 @@
 
   case 12:
 /* Line 661 of lalr1.cc  */
-#line 1205 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1205 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -2705,7 +2705,7 @@
 
   case 13:
 /* Line 661 of lalr1.cc  */
-#line 1216 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1216 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
     }
@@ -2713,7 +2713,7 @@
 
   case 14:
 /* Line 661 of lalr1.cc  */
-#line 1221 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1221 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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 );
     }
@@ -2721,7 +2721,7 @@
 
   case 15:
 /* Line 661 of lalr1.cc  */
-#line 1230 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1230 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -2731,7 +2731,7 @@
 
   case 16:
 /* Line 661 of lalr1.cc  */
-#line 1237 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1237 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -2741,7 +2741,7 @@
 
   case 17:
 /* Line 661 of lalr1.cc  */
-#line 1244 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1244 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -2753,7 +2753,7 @@
 
   case 18:
 /* Line 661 of lalr1.cc  */
-#line 1253 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1253 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
@@ -2761,7 +2761,7 @@
 
   case 19:
 /* Line 661 of lalr1.cc  */
-#line 1260 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1260 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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();
@@ -2772,7 +2772,7 @@
 
   case 20:
 /* Line 661 of lalr1.cc  */
-#line 1268 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1268 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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();
@@ -2783,7 +2783,7 @@
 
   case 21:
 /* Line 661 of lalr1.cc  */
-#line 1276 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1276 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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();
@@ -2794,7 +2794,7 @@
 
   case 22:
 /* Line 661 of lalr1.cc  */
-#line 1284 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1284 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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();
@@ -2805,7 +2805,7 @@
 
   case 23:
 /* Line 661 of lalr1.cc  */
-#line 1295 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1295 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
@@ -2813,7 +2813,7 @@
 
   case 24:
 /* Line 661 of lalr1.cc  */
-#line 1300 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1300 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -2823,7 +2823,7 @@
 
   case 25:
 /* Line 661 of lalr1.cc  */
-#line 1307 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1307 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -2833,7 +2833,7 @@
 
   case 26:
 /* Line 661 of lalr1.cc  */
-#line 1314 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1314 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -2845,7 +2845,7 @@
 
   case 27:
 /* Line 661 of lalr1.cc  */
-#line 1326 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1326 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -2855,7 +2855,7 @@
 
   case 28:
 /* Line 661 of lalr1.cc  */
-#line 1336 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1336 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -2865,7 +2865,7 @@
 
   case 29:
 /* Line 661 of lalr1.cc  */
-#line 1343 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1343 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -2874,7 +2874,7 @@
 
   case 30:
 /* Line 661 of lalr1.cc  */
-#line 1350 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1350 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
@@ -2886,7 +2886,7 @@
 
   case 44:
 /* Line 661 of lalr1.cc  */
-#line 1385 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1385 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -2894,7 +2894,7 @@
 
   case 45:
 /* Line 661 of lalr1.cc  */
-#line 1390 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1390 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -2902,7 +2902,7 @@
 
   case 46:
 /* Line 661 of lalr1.cc  */
-#line 1398 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1398 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -2910,7 +2910,7 @@
 
   case 47:
 /* Line 661 of lalr1.cc  */
-#line 1406 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1406 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -2918,7 +2918,7 @@
 
   case 48:
 /* Line 661 of lalr1.cc  */
-#line 1414 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1414 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -2926,7 +2926,7 @@
 
   case 49:
 /* Line 661 of lalr1.cc  */
-#line 1419 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1419 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -2934,7 +2934,7 @@
 
   case 50:
 /* Line 661 of lalr1.cc  */
-#line 1427 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1427 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -2942,7 +2942,7 @@
 
   case 51:
 /* Line 661 of lalr1.cc  */
-#line 1432 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1432 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -2950,7 +2950,7 @@
 
   case 52:
 /* Line 661 of lalr1.cc  */
-#line 1440 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1440 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -2958,7 +2958,7 @@
 
   case 53:
 /* Line 661 of lalr1.cc  */
-#line 1445 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1445 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -2966,7 +2966,7 @@
 
   case 54:
 /* Line 661 of lalr1.cc  */
-#line 1453 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1453 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
@@ -2974,7 +2974,7 @@
 
   case 55:
 /* Line 661 of lalr1.cc  */
-#line 1458 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1458 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
@@ -2982,7 +2982,7 @@
 
   case 56:
 /* Line 661 of lalr1.cc  */
-#line 1463 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1463 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
@@ -2990,7 +2990,7 @@
 
   case 57:
 /* Line 661 of lalr1.cc  */
-#line 1468 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1468 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
@@ -2998,7 +2998,7 @@
 
   case 60:
 /* Line 661 of lalr1.cc  */
-#line 1481 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1481 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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\"");
@@ -3008,7 +3008,7 @@
 
   case 61:
 /* Line 661 of lalr1.cc  */
-#line 1491 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1491 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
@@ -3016,7 +3016,7 @@
 
   case 62:
 /* Line 661 of lalr1.cc  */
-#line 1496 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1496 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3027,7 +3027,7 @@
 
   case 63:
 /* Line 661 of lalr1.cc  */
-#line 1504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1504 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3038,7 +3038,7 @@
 
   case 64:
 /* Line 661 of lalr1.cc  */
-#line 1512 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1512 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3049,7 +3049,7 @@
 
   case 65:
 /* Line 661 of lalr1.cc  */
-#line 1523 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1523 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3059,7 +3059,7 @@
 
   case 66:
 /* Line 661 of lalr1.cc  */
-#line 1530 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1530 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -3070,7 +3070,7 @@
 
   case 67:
 /* Line 661 of lalr1.cc  */
-#line 1541 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1541 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -3079,7 +3079,7 @@
 
   case 68:
 /* Line 661 of lalr1.cc  */
-#line 1547 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1547 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -3087,7 +3087,7 @@
 
   case 69:
 /* Line 661 of lalr1.cc  */
-#line 1555 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1555 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3097,7 +3097,7 @@
 
   case 70:
 /* Line 661 of lalr1.cc  */
-#line 1562 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1562 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3107,7 +3107,7 @@
 
   case 71:
 /* Line 661 of lalr1.cc  */
-#line 1569 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1569 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3119,7 +3119,7 @@
 
   case 72:
 /* Line 661 of lalr1.cc  */
-#line 1578 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1578 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)),
@@ -3133,7 +3133,7 @@
 
   case 73:
 /* Line 661 of lalr1.cc  */
-#line 1592 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1592 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -3142,7 +3142,7 @@
 
   case 74:
 /* Line 661 of lalr1.cc  */
-#line 1601 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1601 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3152,7 +3152,7 @@
 
   case 75:
 /* Line 661 of lalr1.cc  */
-#line 1608 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1608 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3162,7 +3162,7 @@
 
   case 76:
 /* Line 661 of lalr1.cc  */
-#line 1618 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1618 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3172,7 +3172,7 @@
 
   case 77:
 /* Line 661 of lalr1.cc  */
-#line 1625 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1625 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3181,7 +3181,7 @@
 
   case 78:
 /* Line 661 of lalr1.cc  */
-#line 1632 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1632 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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();
@@ -3192,7 +3192,7 @@
 
   case 87:
 /* Line 661 of lalr1.cc  */
-#line 1655 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1655 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3201,7 +3201,7 @@
 
   case 88:
 /* Line 661 of lalr1.cc  */
-#line 1661 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1661 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3210,7 +3210,7 @@
 
   case 89:
 /* Line 661 of lalr1.cc  */
-#line 1670 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1670 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3220,7 +3220,7 @@
 
   case 90:
 /* Line 661 of lalr1.cc  */
-#line 1677 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1677 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3230,7 +3230,7 @@
 
   case 91:
 /* Line 661 of lalr1.cc  */
-#line 1687 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1687 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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() );
@@ -3240,67 +3240,67 @@
 
   case 92:
 /* Line 661 of lalr1.cc  */
-#line 1696 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1696 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 93:
 /* Line 661 of lalr1.cc  */
-#line 1697 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1697 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 94:
 /* Line 661 of lalr1.cc  */
-#line 1698 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1698 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 95:
 /* Line 661 of lalr1.cc  */
-#line 1699 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1699 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "infinity"; }
     break;
 
   case 96:
 /* Line 661 of lalr1.cc  */
-#line 1700 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1700 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 97:
 /* Line 661 of lalr1.cc  */
-#line 1701 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1701 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 98:
 /* Line 661 of lalr1.cc  */
-#line 1702 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1702 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 99:
 /* Line 661 of lalr1.cc  */
-#line 1703 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1703 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 100:
 /* Line 661 of lalr1.cc  */
-#line 1704 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1704 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 101:
 /* Line 661 of lalr1.cc  */
-#line 1705 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1705 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 102:
 /* Line 661 of lalr1.cc  */
-#line 1711 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1711 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
 
@@ -3319,7 +3319,7 @@
 
   case 103:
 /* Line 661 of lalr1.cc  */
-#line 1730 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1730 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3327,7 +3327,7 @@
 
   case 104:
 /* Line 661 of lalr1.cc  */
-#line 1738 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1738 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3335,7 +3335,7 @@
 
   case 105:
 /* Line 661 of lalr1.cc  */
-#line 1746 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1746 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3345,7 +3345,7 @@
 
   case 106:
 /* Line 661 of lalr1.cc  */
-#line 1753 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1753 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3353,7 +3353,7 @@
 
   case 107:
 /* Line 661 of lalr1.cc  */
-#line 1761 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1761 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3363,7 +3363,7 @@
 
   case 108:
 /* Line 661 of lalr1.cc  */
-#line 1768 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1768 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3371,7 +3371,7 @@
 
   case 109:
 /* Line 661 of lalr1.cc  */
-#line 1773 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1773 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3379,7 +3379,7 @@
 
   case 110:
 /* Line 661 of lalr1.cc  */
-#line 1781 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1781 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3387,7 +3387,7 @@
 
   case 111:
 /* Line 661 of lalr1.cc  */
-#line 1789 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1789 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       std::unique_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3404,7 +3404,7 @@
 
   case 112:
 /* Line 661 of lalr1.cc  */
-#line 1803 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1803 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       std::unique_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3421,7 +3421,7 @@
 
   case 113:
 /* Line 661 of lalr1.cc  */
-#line 1817 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1817 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       std::unique_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3438,7 +3438,7 @@
 
   case 114:
 /* Line 661 of lalr1.cc  */
-#line 1834 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1834 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
@@ -3446,7 +3446,7 @@
 
   case 115:
 /* Line 661 of lalr1.cc  */
-#line 1839 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1839 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3457,7 +3457,7 @@
 
   case 116:
 /* Line 661 of lalr1.cc  */
-#line 1847 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1847 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3468,7 +3468,7 @@
 
   case 117:
 /* Line 661 of lalr1.cc  */
-#line 1855 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1855 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3479,7 +3479,7 @@
 
   case 118:
 /* Line 661 of lalr1.cc  */
-#line 1866 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1866 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3487,7 +3487,7 @@
 
   case 119:
 /* Line 661 of lalr1.cc  */
-#line 1871 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1871 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3496,7 +3496,7 @@
 
   case 120:
 /* Line 661 of lalr1.cc  */
-#line 1880 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1880 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
@@ -3504,7 +3504,7 @@
 
   case 121:
 /* Line 661 of lalr1.cc  */
-#line 1885 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1885 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3514,7 +3514,7 @@
 
   case 122:
 /* Line 661 of lalr1.cc  */
-#line 1892 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1892 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
@@ -3522,7 +3522,7 @@
 
   case 123:
 /* Line 661 of lalr1.cc  */
-#line 1897 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1897 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -3532,7 +3532,7 @@
 
   case 124:
 /* Line 661 of lalr1.cc  */
-#line 1907 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1907 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -3540,7 +3540,7 @@
 
   case 125:
 /* Line 661 of lalr1.cc  */
-#line 1912 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1912 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3549,7 +3549,7 @@
 
   case 126:
 /* Line 661 of lalr1.cc  */
-#line 1921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3558,7 +3558,7 @@
 
   case 127:
 /* Line 661 of lalr1.cc  */
-#line 1927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -3571,7 +3571,7 @@
 
   case 130:
 /* Line 661 of lalr1.cc  */
-#line 1946 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1946 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* body = (yysemantic_stack_[(4) - (4)].expr);
       if (body == NULL)
@@ -3590,7 +3590,7 @@
 
   case 131:
 /* Line 661 of lalr1.cc  */
-#line 1961 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1961 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -3605,7 +3605,7 @@
 
   case 132:
 /* Line 661 of lalr1.cc  */
-#line 1976 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1976 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* body = (yysemantic_stack_[(5) - (5)].expr);
       if (body == NULL)
@@ -3624,7 +3624,7 @@
 
   case 133:
 /* Line 661 of lalr1.cc  */
-#line 1992 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 1992 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -3639,7 +3639,7 @@
 
   case 134:
 /* Line 661 of lalr1.cc  */
-#line 2007 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2007 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -3647,7 +3647,7 @@
 
   case 135:
 /* Line 661 of lalr1.cc  */
-#line 2012 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2012 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -3655,7 +3655,7 @@
 
   case 136:
 /* Line 661 of lalr1.cc  */
-#line 2017 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2017 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceTypeAST*>((yysemantic_stack_[(4) - (4)].node)));
     }
@@ -3663,7 +3663,7 @@
 
   case 137:
 /* Line 661 of lalr1.cc  */
-#line 2022 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2022 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceTypeAST*>((yysemantic_stack_[(5) - (5)].node)));
     }
@@ -3671,7 +3671,7 @@
 
   case 138:
 /* Line 661 of lalr1.cc  */
-#line 2030 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2030 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -3681,7 +3681,7 @@
 
   case 139:
 /* Line 661 of lalr1.cc  */
-#line 2037 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2037 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -3692,7 +3692,7 @@
 
   case 140:
 /* Line 661 of lalr1.cc  */
-#line 2048 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2048 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
@@ -3700,7 +3700,7 @@
 
   case 141:
 /* Line 661 of lalr1.cc  */
-#line 2053 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2053 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -3710,7 +3710,7 @@
 
   case 142:
 /* Line 661 of lalr1.cc  */
-#line 2063 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2063 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -3723,7 +3723,7 @@
 
   case 143:
 /* Line 661 of lalr1.cc  */
-#line 2072 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2072 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -3736,7 +3736,7 @@
 
   case 144:
 /* Line 661 of lalr1.cc  */
-#line 2081 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2081 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3749,7 +3749,7 @@
 
   case 145:
 /* Line 661 of lalr1.cc  */
-#line 2090 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2090 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -3762,7 +3762,7 @@
 
   case 146:
 /* Line 661 of lalr1.cc  */
-#line 2102 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2102 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceTypeAST(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -3770,7 +3770,7 @@
 
   case 147:
 /* Line 661 of lalr1.cc  */
-#line 2106 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2106 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceTypeAST(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -3780,7 +3780,7 @@
 
   case 148:
 /* Line 661 of lalr1.cc  */
-#line 2112 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2112 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceTypeAST(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -3788,7 +3788,7 @@
 
   case 149:
 /* Line 661 of lalr1.cc  */
-#line 2116 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2116 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceTypeAST(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -3799,7 +3799,7 @@
 
   case 150:
 /* Line 661 of lalr1.cc  */
-#line 2126 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2126 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -3813,7 +3813,7 @@
 
   case 151:
 /* Line 661 of lalr1.cc  */
-#line 2136 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2136 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -3827,7 +3827,7 @@
 
   case 152:
 /* Line 661 of lalr1.cc  */
-#line 2149 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2149 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -3837,7 +3837,7 @@
 
   case 153:
 /* Line 661 of lalr1.cc  */
-#line 2155 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2155 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -3846,7 +3846,7 @@
 
   case 154:
 /* Line 661 of lalr1.cc  */
-#line 2164 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2164 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -3854,7 +3854,7 @@
 
   case 155:
 /* Line 661 of lalr1.cc  */
-#line 2169 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2169 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -3865,7 +3865,7 @@
 
   case 156:
 /* Line 661 of lalr1.cc  */
-#line 2176 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2176 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -3876,7 +3876,7 @@
 
   case 157:
 /* Line 661 of lalr1.cc  */
-#line 2183 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2183 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -3887,7 +3887,7 @@
 
   case 158:
 /* Line 661 of lalr1.cc  */
-#line 2195 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2195 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -3899,7 +3899,7 @@
 
   case 159:
 /* Line 661 of lalr1.cc  */
-#line 2205 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2205 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -3911,7 +3911,7 @@
 
   case 160:
 /* Line 661 of lalr1.cc  */
-#line 2215 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2215 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -3923,7 +3923,7 @@
 
   case 161:
 /* Line 661 of lalr1.cc  */
-#line 2226 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2226 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -3938,7 +3938,7 @@
 
   case 162:
 /* Line 661 of lalr1.cc  */
-#line 2242 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2242 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -3958,7 +3958,7 @@
 
   case 163:
 /* Line 661 of lalr1.cc  */
-#line 2262 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2262 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3966,7 +3966,7 @@
 
   case 164:
 /* Line 661 of lalr1.cc  */
-#line 2266 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2266 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3974,7 +3974,7 @@
 
   case 165:
 /* Line 661 of lalr1.cc  */
-#line 2270 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2270 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -3982,7 +3982,7 @@
 
   case 166:
 /* Line 661 of lalr1.cc  */
-#line 2278 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2278 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3990,7 +3990,7 @@
 
   case 167:
 /* Line 661 of lalr1.cc  */
-#line 2282 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2282 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -3998,7 +3998,7 @@
 
   case 168:
 /* Line 661 of lalr1.cc  */
-#line 2286 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2286 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -4006,7 +4006,7 @@
 
   case 169:
 /* Line 661 of lalr1.cc  */
-#line 2294 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2294 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4014,7 +4014,7 @@
 
   case 170:
 /* Line 661 of lalr1.cc  */
-#line 2299 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2299 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4026,7 +4026,7 @@
 
   case 171:
 /* Line 661 of lalr1.cc  */
-#line 2311 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2311 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4036,7 +4036,7 @@
 
   case 172:
 /* Line 661 of lalr1.cc  */
-#line 2318 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2318 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4048,12 +4048,12 @@
 
   case 173:
 /* Line 661 of lalr1.cc  */
-#line 2328 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2328 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr);
       (yyval.expr) = (yysemantic_stack_[(4) - (2)].expr);
       (yyval.expr) = (yysemantic_stack_[(4) - (4)].expr);
-      error((yylocation_stack_[(4) - (3)]), "syntax error, unexpected statement");
+      error((yylocation_stack_[(4) - (3)]), "syntax error, unexpected statement (missing semicolon \";\" between statements?)");
       delete (yysemantic_stack_[(4) - (1)].expr);
       delete (yysemantic_stack_[(4) - (2)].expr);
       delete (yysemantic_stack_[(4) - (4)].expr);
@@ -4063,7 +4063,7 @@
 
   case 187:
 /* Line 661 of lalr1.cc  */
-#line 2361 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2361 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4071,7 +4071,7 @@
 
   case 188:
 /* Line 661 of lalr1.cc  */
-#line 2369 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2369 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
 
@@ -4103,7 +4103,7 @@
 
   case 189:
 /* Line 661 of lalr1.cc  */
-#line 2401 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2401 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4111,7 +4111,7 @@
 
   case 190:
 /* Line 661 of lalr1.cc  */
-#line 2409 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2409 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4119,7 +4119,7 @@
 
   case 191:
 /* Line 661 of lalr1.cc  */
-#line 2417 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2417 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4129,7 +4129,7 @@
 
   case 192:
 /* Line 661 of lalr1.cc  */
-#line 2424 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2424 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4139,7 +4139,7 @@
 
   case 193:
 /* Line 661 of lalr1.cc  */
-#line 2431 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2431 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4150,7 +4150,7 @@
 
   case 194:
 /* Line 661 of lalr1.cc  */
-#line 2442 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2442 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4163,7 +4163,7 @@
 
   case 195:
 /* Line 661 of lalr1.cc  */
-#line 2451 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2451 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4176,7 +4176,7 @@
 
   case 196:
 /* Line 661 of lalr1.cc  */
-#line 2460 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2460 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4189,7 +4189,7 @@
 
   case 197:
 /* Line 661 of lalr1.cc  */
-#line 2469 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2469 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4202,7 +4202,7 @@
 
   case 198:
 /* Line 661 of lalr1.cc  */
-#line 2482 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2482 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -4210,7 +4210,7 @@
 
   case 199:
 /* Line 661 of lalr1.cc  */
-#line 2490 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2490 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4218,7 +4218,7 @@
 
   case 200:
 /* Line 661 of lalr1.cc  */
-#line 2498 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2498 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4226,7 +4226,7 @@
 
   case 201:
 /* Line 661 of lalr1.cc  */
-#line 2506 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2506 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4241,7 +4241,7 @@
 
   case 202:
 /* Line 661 of lalr1.cc  */
-#line 2521 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2521 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4249,7 +4249,7 @@
 
   case 203:
 /* Line 661 of lalr1.cc  */
-#line 2526 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2526 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4257,7 +4257,7 @@
 
   case 204:
 /* Line 661 of lalr1.cc  */
-#line 2534 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2534 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4271,7 +4271,7 @@
 
   case 205:
 /* Line 661 of lalr1.cc  */
-#line 2548 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2548 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4288,7 +4288,7 @@
 
   case 206:
 /* Line 661 of lalr1.cc  */
-#line 2565 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2565 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4313,7 +4313,7 @@
 
   case 207:
 /* Line 661 of lalr1.cc  */
-#line 2590 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2590 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4321,7 +4321,7 @@
 
   case 208:
 /* Line 661 of lalr1.cc  */
-#line 2598 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2598 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4331,7 +4331,7 @@
 
   case 209:
 /* Line 661 of lalr1.cc  */
-#line 2605 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2605 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4342,7 +4342,7 @@
 
   case 210:
 /* Line 661 of lalr1.cc  */
-#line 2616 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2616 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -4351,7 +4351,7 @@
 
   case 211:
 /* Line 661 of lalr1.cc  */
-#line 2625 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2625 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4359,7 +4359,7 @@
 
   case 212:
 /* Line 661 of lalr1.cc  */
-#line 2633 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2633 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4367,7 +4367,7 @@
 
   case 213:
 /* Line 661 of lalr1.cc  */
-#line 2638 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2638 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4382,17 +4382,15 @@
 
   case 214:
 /* Line 661 of lalr1.cc  */
-#line 2651 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2651 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr);
       (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr);
 
 
 
-
-
       if (dynamic_cast<PathExpr*>((yysemantic_stack_[(3) - (1)].expr)) == NULL)
-        error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected expression");
+        error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected expression (missing comma \",\" between expressions?)");
       delete (yysemantic_stack_[(3) - (1)].expr);
       delete (yysemantic_stack_[(3) - (3)].expr);
       YYERROR;
@@ -4401,7 +4399,7 @@
 
   case 233:
 /* Line 661 of lalr1.cc  */
-#line 2700 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2698 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4415,7 +4413,7 @@
 
   case 234:
 /* Line 661 of lalr1.cc  */
-#line 2714 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2712 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4423,14 +4421,14 @@
 
   case 236:
 /* Line 661 of lalr1.cc  */
-#line 2726 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2724 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
     }
     break;
 
   case 237:
 /* Line 661 of lalr1.cc  */
-#line 2733 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2731 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4438,7 +4436,7 @@
 
   case 238:
 /* Line 661 of lalr1.cc  */
-#line 2738 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2736 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4446,7 +4444,7 @@
 
   case 239:
 /* Line 661 of lalr1.cc  */
-#line 2746 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2744 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4454,7 +4452,7 @@
 
   case 240:
 /* Line 661 of lalr1.cc  */
-#line 2751 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2749 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -4462,7 +4460,7 @@
 
   case 241:
 /* Line 661 of lalr1.cc  */
-#line 2756 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2754 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -4470,7 +4468,7 @@
 
   case 242:
 /* Line 661 of lalr1.cc  */
-#line 2764 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2762 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -4482,7 +4480,7 @@
 
   case 243:
 /* Line 661 of lalr1.cc  */
-#line 2773 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2771 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -4494,7 +4492,7 @@
 
   case 244:
 /* Line 661 of lalr1.cc  */
-#line 2785 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2783 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -4508,7 +4506,7 @@
 
   case 245:
 /* Line 661 of lalr1.cc  */
-#line 2795 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2793 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -4521,7 +4519,7 @@
 
   case 246:
 /* Line 661 of lalr1.cc  */
-#line 2808 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2806 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4529,7 +4527,7 @@
 
   case 255:
 /* Line 661 of lalr1.cc  */
-#line 2832 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2830 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4539,7 +4537,7 @@
 
   case 256:
 /* Line 661 of lalr1.cc  */
-#line 2839 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2837 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -4549,7 +4547,7 @@
 
   case 257:
 /* Line 661 of lalr1.cc  */
-#line 2849 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2847 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -4557,7 +4555,7 @@
 
   case 258:
 /* Line 661 of lalr1.cc  */
-#line 2854 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2852 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -4569,7 +4567,7 @@
 
   case 259:
 /* Line 661 of lalr1.cc  */
-#line 2863 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2861 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -4581,7 +4579,7 @@
 
   case 260:
 /* Line 661 of lalr1.cc  */
-#line 2872 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2870 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = NULL;
       error((yylocation_stack_[(2) - (2)]), "");
@@ -4591,7 +4589,7 @@
 
   case 262:
 /* Line 661 of lalr1.cc  */
-#line 2886 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2884 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
     }
@@ -4599,7 +4597,7 @@
 
   case 263:
 /* Line 661 of lalr1.cc  */
-#line 2894 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2892 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4609,7 +4607,7 @@
 
   case 264:
 /* Line 661 of lalr1.cc  */
-#line 2901 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2899 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -4619,7 +4617,7 @@
 
   case 265:
 /* Line 661 of lalr1.cc  */
-#line 2909 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2907 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -4631,7 +4629,7 @@
 
   case 266:
 /* Line 661 of lalr1.cc  */
-#line 2921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2919 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -4645,7 +4643,7 @@
 
   case 267:
 /* Line 661 of lalr1.cc  */
-#line 2931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4659,7 +4657,7 @@
 
   case 268:
 /* Line 661 of lalr1.cc  */
-#line 2941 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2939 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4673,7 +4671,7 @@
 
   case 269:
 /* Line 661 of lalr1.cc  */
-#line 2951 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4687,7 +4685,7 @@
 
   case 270:
 /* Line 661 of lalr1.cc  */
-#line 2961 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2959 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4701,7 +4699,7 @@
 
   case 271:
 /* Line 661 of lalr1.cc  */
-#line 2971 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2969 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4715,7 +4713,7 @@
 
   case 272:
 /* Line 661 of lalr1.cc  */
-#line 2981 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2979 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4729,7 +4727,7 @@
 
   case 273:
 /* Line 661 of lalr1.cc  */
-#line 2991 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 2989 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -4743,7 +4741,7 @@
 
   case 274:
 /* Line 661 of lalr1.cc  */
-#line 3002 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3000 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -4756,7 +4754,7 @@
 
   case 275:
 /* Line 661 of lalr1.cc  */
-#line 3011 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3009 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4770,7 +4768,7 @@
 
   case 276:
 /* Line 661 of lalr1.cc  */
-#line 3021 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3019 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -4784,7 +4782,7 @@
 
   case 277:
 /* Line 661 of lalr1.cc  */
-#line 3031 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3029 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -4798,7 +4796,7 @@
 
   case 278:
 /* Line 661 of lalr1.cc  */
-#line 3047 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3045 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4806,7 +4804,7 @@
 
   case 279:
 /* Line 661 of lalr1.cc  */
-#line 3056 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3054 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4814,7 +4812,7 @@
 
   case 280:
 /* Line 661 of lalr1.cc  */
-#line 3065 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3063 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
@@ -4822,7 +4820,7 @@
 
   case 281:
 /* Line 661 of lalr1.cc  */
-#line 3073 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3071 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4832,7 +4830,7 @@
 
   case 282:
 /* Line 661 of lalr1.cc  */
-#line 3079 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3077 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -4842,7 +4840,7 @@
 
   case 283:
 /* Line 661 of lalr1.cc  */
-#line 3091 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3089 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4854,7 +4852,7 @@
 
   case 284:
 /* Line 661 of lalr1.cc  */
-#line 3099 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3097 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4866,7 +4864,7 @@
 
   case 285:
 /* Line 661 of lalr1.cc  */
-#line 3109 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3107 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -4878,7 +4876,7 @@
 
   case 286:
 /* Line 661 of lalr1.cc  */
-#line 3117 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3115 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -4890,7 +4888,7 @@
 
   case 287:
 /* Line 661 of lalr1.cc  */
-#line 3129 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3127 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4900,7 +4898,7 @@
 
   case 288:
 /* Line 661 of lalr1.cc  */
-#line 3135 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3133 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4911,7 +4909,7 @@
 
   case 290:
 /* Line 661 of lalr1.cc  */
-#line 3148 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3146 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
@@ -4919,7 +4917,7 @@
 
   case 291:
 /* Line 661 of lalr1.cc  */
-#line 3152 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3150 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -4928,7 +4926,7 @@
 
   case 292:
 /* Line 661 of lalr1.cc  */
-#line 3160 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3158 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
@@ -4936,7 +4934,7 @@
 
   case 293:
 /* Line 661 of lalr1.cc  */
-#line 3164 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3162 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -4945,7 +4943,7 @@
 
   case 295:
 /* Line 661 of lalr1.cc  */
-#line 3173 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3171 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
     }
@@ -4953,7 +4951,7 @@
 
   case 296:
 /* Line 661 of lalr1.cc  */
-#line 3177 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3175 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -4961,7 +4959,7 @@
 
   case 297:
 /* Line 661 of lalr1.cc  */
-#line 3181 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3179 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
@@ -4969,7 +4967,7 @@
 
   case 298:
 /* Line 661 of lalr1.cc  */
-#line 3191 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3189 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -4977,7 +4975,7 @@
 
   case 299:
 /* Line 661 of lalr1.cc  */
-#line 3199 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3197 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -4985,7 +4983,7 @@
 
   case 300:
 /* Line 661 of lalr1.cc  */
-#line 3206 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3204 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4995,7 +4993,7 @@
 
   case 301:
 /* Line 661 of lalr1.cc  */
-#line 3212 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3210 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5005,7 +5003,7 @@
 
   case 302:
 /* Line 661 of lalr1.cc  */
-#line 3222 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3220 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
     }
@@ -5013,7 +5011,7 @@
 
   case 303:
 /* Line 661 of lalr1.cc  */
-#line 3226 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3224 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5025,7 +5023,7 @@
 
   case 304:
 /* Line 661 of lalr1.cc  */
-#line 3234 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3232 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5037,7 +5035,7 @@
 
   case 305:
 /* Line 661 of lalr1.cc  */
-#line 3242 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3240 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5049,7 +5047,7 @@
 
   case 306:
 /* Line 661 of lalr1.cc  */
-#line 3250 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3248 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarRef* varRef = dynamic_cast<VarRef*>((yysemantic_stack_[(1) - (1)].expr));
       if (varRef != NULL)
@@ -5061,7 +5059,7 @@
 
   case 307:
 /* Line 661 of lalr1.cc  */
-#line 3258 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3256 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       VarRef* varRef = dynamic_cast<VarRef*>((yysemantic_stack_[(2) - (1)].expr));
       if (varRef != NULL)
@@ -5073,7 +5071,7 @@
 
   case 308:
 /* Line 661 of lalr1.cc  */
-#line 3270 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3268 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -5081,7 +5079,7 @@
 
   case 309:
 /* Line 661 of lalr1.cc  */
-#line 3278 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3276 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5091,7 +5089,7 @@
 
   case 310:
 /* Line 661 of lalr1.cc  */
-#line 3284 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3282 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5101,7 +5099,7 @@
 
   case 311:
 /* Line 661 of lalr1.cc  */
-#line 3294 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3292 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5111,7 +5109,7 @@
 
   case 312:
 /* Line 661 of lalr1.cc  */
-#line 3300 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3298 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -5121,7 +5119,7 @@
 
   case 313:
 /* Line 661 of lalr1.cc  */
-#line 3310 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3308 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5129,7 +5127,7 @@
 
   case 314:
 /* Line 661 of lalr1.cc  */
-#line 3314 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3312 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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))
@@ -5139,7 +5137,7 @@
 
   case 315:
 /* Line 661 of lalr1.cc  */
-#line 3324 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3322 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5149,7 +5147,7 @@
 
   case 316:
 /* Line 661 of lalr1.cc  */
-#line 3330 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3328 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5159,7 +5157,7 @@
 
   case 317:
 /* Line 661 of lalr1.cc  */
-#line 3336 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3334 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5169,7 +5167,7 @@
 
   case 318:
 /* Line 661 of lalr1.cc  */
-#line 3342 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3340 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5182,7 +5180,7 @@
 
   case 319:
 /* Line 661 of lalr1.cc  */
-#line 3351 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3349 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5195,7 +5193,7 @@
 
   case 320:
 /* Line 661 of lalr1.cc  */
-#line 3360 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3358 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5208,7 +5206,7 @@
 
   case 321:
 /* Line 661 of lalr1.cc  */
-#line 3369 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3367 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5221,7 +5219,7 @@
 
   case 322:
 /* Line 661 of lalr1.cc  */
-#line 3382 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3380 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5229,7 +5227,7 @@
 
   case 323:
 /* Line 661 of lalr1.cc  */
-#line 3386 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3384 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5237,7 +5235,7 @@
 
   case 324:
 /* Line 661 of lalr1.cc  */
-#line 3394 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3392 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5247,7 +5245,7 @@
 
   case 325:
 /* Line 661 of lalr1.cc  */
-#line 3400 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3398 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5257,7 +5255,7 @@
 
   case 326:
 /* Line 661 of lalr1.cc  */
-#line 3410 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3408 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5265,7 +5263,7 @@
 
   case 327:
 /* Line 661 of lalr1.cc  */
-#line 3418 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3416 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5278,7 +5276,7 @@
 
   case 328:
 /* Line 661 of lalr1.cc  */
-#line 3427 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3425 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5291,7 +5289,7 @@
 
   case 329:
 /* Line 661 of lalr1.cc  */
-#line 3440 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3438 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5302,7 +5300,7 @@
 
   case 330:
 /* Line 661 of lalr1.cc  */
-#line 3447 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3445 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)) );
@@ -5312,7 +5310,7 @@
 
   case 331:
 /* Line 661 of lalr1.cc  */
-#line 3459 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3457 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5320,7 +5318,7 @@
 
   case 332:
 /* Line 661 of lalr1.cc  */
-#line 3463 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3461 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5331,7 +5329,7 @@
 
   case 333:
 /* Line 661 of lalr1.cc  */
-#line 3475 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3473 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5339,7 +5337,7 @@
 
   case 334:
 /* Line 661 of lalr1.cc  */
-#line 3482 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3480 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5349,7 +5347,7 @@
 
   case 335:
 /* Line 661 of lalr1.cc  */
-#line 3488 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3486 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5359,7 +5357,7 @@
 
   case 336:
 /* Line 661 of lalr1.cc  */
-#line 3497 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3495 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5367,7 +5365,7 @@
 
   case 337:
 /* Line 661 of lalr1.cc  */
-#line 3504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3502 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5377,7 +5375,7 @@
 
   case 338:
 /* Line 661 of lalr1.cc  */
-#line 3510 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3508 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
@@ -5387,7 +5385,7 @@
 
   case 339:
 /* Line 661 of lalr1.cc  */
-#line 3521 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3519 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5395,7 +5393,7 @@
 
   case 340:
 /* Line 661 of lalr1.cc  */
-#line 3528 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3526 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5405,7 +5403,7 @@
 
   case 341:
 /* Line 661 of lalr1.cc  */
-#line 3534 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3532 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5415,7 +5413,7 @@
 
   case 342:
 /* Line 661 of lalr1.cc  */
-#line 3543 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3541 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5423,7 +5421,7 @@
 
   case 343:
 /* Line 661 of lalr1.cc  */
-#line 3552 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3550 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5434,7 +5432,7 @@
 
   case 344:
 /* Line 661 of lalr1.cc  */
-#line 3559 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3557 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -5446,7 +5444,7 @@
 
   case 345:
 /* Line 661 of lalr1.cc  */
-#line 3570 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3568 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5457,7 +5455,7 @@
 
   case 346:
 /* Line 661 of lalr1.cc  */
-#line 3577 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3575 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -5469,7 +5467,7 @@
 
   case 347:
 /* Line 661 of lalr1.cc  */
-#line 3589 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3587 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5479,7 +5477,7 @@
 
   case 348:
 /* Line 661 of lalr1.cc  */
-#line 3595 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3593 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5489,7 +5487,7 @@
 
   case 349:
 /* Line 661 of lalr1.cc  */
-#line 3607 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3605 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5499,7 +5497,7 @@
 
   case 350:
 /* Line 661 of lalr1.cc  */
-#line 3613 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3611 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -5510,7 +5508,7 @@
 
   case 351:
 /* Line 661 of lalr1.cc  */
-#line 3624 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3622 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5520,7 +5518,7 @@
 
   case 352:
 /* Line 661 of lalr1.cc  */
-#line 3630 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3628 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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)));
@@ -5530,7 +5528,7 @@
 
   case 353:
 /* Line 661 of lalr1.cc  */
-#line 3641 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3639 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5540,7 +5538,7 @@
 
   case 354:
 /* Line 661 of lalr1.cc  */
-#line 3647 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3645 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -5551,7 +5549,7 @@
 
   case 355:
 /* Line 661 of lalr1.cc  */
-#line 3658 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3656 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
       seqList->push_back(static_cast<SequenceTypeAST*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5561,7 +5559,7 @@
 
   case 356:
 /* Line 661 of lalr1.cc  */
-#line 3664 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3662 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = static_cast<SequenceTypeList*>((yysemantic_stack_[(3) - (1)].node));
       seqList->push_back(static_cast<SequenceTypeAST*>((yysemantic_stack_[(3) - (3)].node)));
@@ -5571,7 +5569,7 @@
 
   case 357:
 /* Line 661 of lalr1.cc  */
-#line 3675 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3673 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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));
     }
@@ -5579,7 +5577,7 @@
 
   case 358:
 /* Line 661 of lalr1.cc  */
-#line 3684 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3682 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -5587,7 +5585,7 @@
 
   case 359:
 /* Line 661 of lalr1.cc  */
-#line 3688 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3686 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
@@ -5595,7 +5593,7 @@
 
   case 360:
 /* Line 661 of lalr1.cc  */
-#line 3702 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3700 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5603,7 +5601,7 @@
 
   case 361:
 /* Line 661 of lalr1.cc  */
-#line 3712 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3710 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5611,7 +5609,7 @@
 
   case 362:
 /* Line 661 of lalr1.cc  */
-#line 3722 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3720 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5619,7 +5617,7 @@
 
   case 363:
 /* Line 661 of lalr1.cc  */
-#line 3726 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3724 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new ComparisonExpr(
               LOC((yyloc)),
@@ -5632,7 +5630,7 @@
 
   case 364:
 /* Line 661 of lalr1.cc  */
-#line 3741 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3739 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5640,7 +5638,7 @@
 
   case 365:
 /* Line 661 of lalr1.cc  */
-#line 3745 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3743 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
             (yyval.expr) = new ComparisonExpr(
@@ -5654,7 +5652,7 @@
 
   case 366:
 /* Line 661 of lalr1.cc  */
-#line 3755 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3753 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
             (yyval.expr) = new ComparisonExpr(
@@ -5665,7 +5663,7 @@
 
   case 367:
 /* Line 661 of lalr1.cc  */
-#line 3762 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3760 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5678,7 +5676,7 @@
 
   case 368:
 /* Line 661 of lalr1.cc  */
-#line 3771 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3769 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5691,7 +5689,7 @@
 
   case 369:
 /* Line 661 of lalr1.cc  */
-#line 3780 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3778 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
 
@@ -5704,7 +5702,7 @@
 
   case 370:
 /* Line 661 of lalr1.cc  */
-#line 3789 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3787 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5717,7 +5715,7 @@
 
   case 371:
 /* Line 661 of lalr1.cc  */
-#line 3798 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3796 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5730,7 +5728,7 @@
 
   case 372:
 /* Line 661 of lalr1.cc  */
-#line 3807 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3805 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5743,7 +5741,7 @@
 
   case 373:
 /* Line 661 of lalr1.cc  */
-#line 3816 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3814 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -5756,7 +5754,7 @@
 
   case 374:
 /* Line 661 of lalr1.cc  */
-#line 3829 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3827 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5764,7 +5762,7 @@
 
   case 375:
 /* Line 661 of lalr1.cc  */
-#line 3833 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3831 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -5777,7 +5775,7 @@
 
   case 376:
 /* Line 661 of lalr1.cc  */
-#line 3845 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3843 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5785,7 +5783,7 @@
 
   case 377:
 /* Line 661 of lalr1.cc  */
-#line 3849 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3847 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
@@ -5793,7 +5791,7 @@
 
   case 378:
 /* Line 661 of lalr1.cc  */
-#line 3856 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3854 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -5801,7 +5799,7 @@
 
   case 379:
 /* Line 661 of lalr1.cc  */
-#line 3860 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3858 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -5809,7 +5807,7 @@
 
   case 380:
 /* Line 661 of lalr1.cc  */
-#line 3867 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3865 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5817,7 +5815,7 @@
 
   case 381:
 /* Line 661 of lalr1.cc  */
-#line 3871 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3869 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5825,7 +5823,7 @@
 
   case 382:
 /* Line 661 of lalr1.cc  */
-#line 3880 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3878 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5833,7 +5831,7 @@
 
   case 383:
 /* Line 661 of lalr1.cc  */
-#line 3884 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3882 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5841,7 +5839,7 @@
 
   case 384:
 /* Line 661 of lalr1.cc  */
-#line 3888 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3886 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5849,7 +5847,7 @@
 
   case 385:
 /* Line 661 of lalr1.cc  */
-#line 3896 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3894 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5857,7 +5855,7 @@
 
   case 386:
 /* Line 661 of lalr1.cc  */
-#line 3900 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3898 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5867,7 +5865,7 @@
 
   case 387:
 /* Line 661 of lalr1.cc  */
-#line 3906 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3904 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5877,7 +5875,7 @@
 
   case 388:
 /* Line 661 of lalr1.cc  */
-#line 3912 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3910 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5887,7 +5885,7 @@
 
   case 389:
 /* Line 661 of lalr1.cc  */
-#line 3918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3916 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5897,7 +5895,7 @@
 
   case 390:
 /* Line 661 of lalr1.cc  */
-#line 3928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5905,7 +5903,7 @@
 
   case 391:
 /* Line 661 of lalr1.cc  */
-#line 3932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5913,7 +5911,7 @@
 
   case 392:
 /* Line 661 of lalr1.cc  */
-#line 3936 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3934 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -5921,7 +5919,7 @@
 
   case 393:
 /* Line 661 of lalr1.cc  */
-#line 3944 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3942 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5929,7 +5927,7 @@
 
   case 394:
 /* Line 661 of lalr1.cc  */
-#line 3948 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3946 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5939,7 +5937,7 @@
 
   case 395:
 /* Line 661 of lalr1.cc  */
-#line 3954 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -5949,7 +5947,7 @@
 
   case 396:
 /* Line 661 of lalr1.cc  */
-#line 3964 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3962 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5957,7 +5955,7 @@
 
   case 397:
 /* Line 661 of lalr1.cc  */
-#line 3968 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3966 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InstanceofExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceTypeAST*>((yysemantic_stack_[(4) - (4)].node))
@@ -5967,7 +5965,7 @@
 
   case 398:
 /* Line 661 of lalr1.cc  */
-#line 3978 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3976 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5975,7 +5973,7 @@
 
   case 399:
 /* Line 661 of lalr1.cc  */
-#line 3982 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3980 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new TreatExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceTypeAST*>((yysemantic_stack_[(4) - (4)].node))
@@ -5985,7 +5983,7 @@
 
   case 400:
 /* Line 661 of lalr1.cc  */
-#line 3992 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3990 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -5993,7 +5991,7 @@
 
   case 401:
 /* Line 661 of lalr1.cc  */
-#line 3996 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 3994 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new CastableExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6003,7 +6001,7 @@
 
   case 402:
 /* Line 661 of lalr1.cc  */
-#line 4006 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4004 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6011,7 +6009,7 @@
 
   case 403:
 /* Line 661 of lalr1.cc  */
-#line 4010 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4008 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new CastExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6021,7 +6019,7 @@
 
   case 404:
 /* Line 661 of lalr1.cc  */
-#line 4020 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4018 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
     }
@@ -6029,7 +6027,7 @@
 
   case 405:
 /* Line 661 of lalr1.cc  */
-#line 4024 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4022 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
     }
@@ -6037,7 +6035,7 @@
 
   case 406:
 /* Line 661 of lalr1.cc  */
-#line 4033 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4031 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6045,7 +6043,7 @@
 
   case 407:
 /* Line 661 of lalr1.cc  */
-#line 4037 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4035 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -6053,7 +6051,7 @@
 
   case 408:
 /* Line 661 of lalr1.cc  */
-#line 4045 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4043 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
@@ -6061,7 +6059,7 @@
 
   case 409:
 /* Line 661 of lalr1.cc  */
-#line 4049 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4047 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), false );
         }
@@ -6069,7 +6067,7 @@
 
   case 410:
 /* Line 661 of lalr1.cc  */
-#line 4053 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4051 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -6077,7 +6075,7 @@
 
   case 411:
 /* Line 661 of lalr1.cc  */
-#line 4057 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4055 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6087,7 +6085,7 @@
 
   case 415:
 /* Line 661 of lalr1.cc  */
-#line 4073 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4071 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
       }
@@ -6095,7 +6093,7 @@
 
   case 416:
 /* Line 661 of lalr1.cc  */
-#line 4078 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4076 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
       }
@@ -6103,7 +6101,7 @@
 
   case 417:
 /* Line 661 of lalr1.cc  */
-#line 4086 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4084 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
@@ -6111,7 +6109,7 @@
 
   case 418:
 /* Line 661 of lalr1.cc  */
-#line 4090 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4088 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
@@ -6119,7 +6117,7 @@
 
   case 419:
 /* Line 661 of lalr1.cc  */
-#line 4094 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4092 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
@@ -6127,7 +6125,7 @@
 
   case 420:
 /* Line 661 of lalr1.cc  */
-#line 4098 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4096 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
@@ -6135,7 +6133,7 @@
 
   case 421:
 /* Line 661 of lalr1.cc  */
-#line 4102 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4100 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
@@ -6143,7 +6141,7 @@
 
   case 422:
 /* Line 661 of lalr1.cc  */
-#line 4106 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4104 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
@@ -6151,7 +6149,7 @@
 
   case 423:
 /* Line 661 of lalr1.cc  */
-#line 4114 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4112 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_is );
         }
@@ -6159,7 +6157,7 @@
 
   case 424:
 /* Line 661 of lalr1.cc  */
-#line 4118 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4116 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_precedes );
         }
@@ -6167,7 +6165,7 @@
 
   case 425:
 /* Line 661 of lalr1.cc  */
-#line 4122 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4120 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_follows );
         }
@@ -6175,7 +6173,7 @@
 
   case 426:
 /* Line 661 of lalr1.cc  */
-#line 4130 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4128 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6183,7 +6181,7 @@
 
   case 427:
 /* Line 661 of lalr1.cc  */
-#line 4134 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4132 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6191,7 +6189,7 @@
 
   case 428:
 /* Line 661 of lalr1.cc  */
-#line 4138 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4136 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6199,7 +6197,7 @@
 
   case 429:
 /* Line 661 of lalr1.cc  */
-#line 4142 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4140 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr(
                 LOC((yyloc)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (3)].node))->get_name(), (yysemantic_stack_[(6) - (5)].expr)
@@ -6210,7 +6208,7 @@
 
   case 430:
 /* Line 661 of lalr1.cc  */
-#line 4153 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4151 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)), (yysemantic_stack_[(4) - (3)].expr)
@@ -6220,7 +6218,7 @@
 
   case 431:
 /* Line 661 of lalr1.cc  */
-#line 4163 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4161 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6230,7 +6228,7 @@
 
   case 432:
 /* Line 661 of lalr1.cc  */
-#line 4169 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4167 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             if ( PragmaList *pl = dynamic_cast<PragmaList*>((yysemantic_stack_[(2) - (1)].node)) )
                 pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -6240,7 +6238,7 @@
 
   case 433:
 /* Line 661 of lalr1.cc  */
-#line 4179 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4177 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
         }
@@ -6248,7 +6246,7 @@
 
   case 434:
 /* Line 661 of lalr1.cc  */
-#line 4183 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4181 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
@@ -6256,7 +6254,7 @@
 
   case 435:
 /* Line 661 of lalr1.cc  */
-#line 4187 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4185 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
@@ -6264,7 +6262,7 @@
 
   case 436:
 /* Line 661 of lalr1.cc  */
-#line 4193 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4191 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new PathExpr(LOC((yyloc)), ParseConstants::path_leading_lone_slash, NULL);
     }
@@ -6272,7 +6270,7 @@
 
   case 437:
 /* Line 661 of lalr1.cc  */
-#line 4197 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4195 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6286,7 +6284,7 @@
 
   case 438:
 /* Line 661 of lalr1.cc  */
-#line 4207 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4205 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6300,7 +6298,7 @@
 
   case 439:
 /* Line 661 of lalr1.cc  */
-#line 4217 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4215 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
 
@@ -6351,7 +6349,7 @@
 
   case 440:
 /* Line 661 of lalr1.cc  */
-#line 4270 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4268 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -6359,7 +6357,7 @@
 
   case 441:
 /* Line 661 of lalr1.cc  */
-#line 4279 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4277 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6373,7 +6371,7 @@
 
   case 442:
 /* Line 661 of lalr1.cc  */
-#line 4289 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4287 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
@@ -6381,7 +6379,7 @@
 
   case 443:
 /* Line 661 of lalr1.cc  */
-#line 4293 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4291 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slashslash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
@@ -6389,7 +6387,7 @@
 
   case 446:
 /* Line 661 of lalr1.cc  */
-#line 4309 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4307 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ForwardStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -6399,7 +6397,7 @@
 
   case 447:
 /* Line 661 of lalr1.cc  */
-#line 4315 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4313 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -6411,7 +6409,7 @@
 
   case 448:
 /* Line 661 of lalr1.cc  */
-#line 4323 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4321 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ReverseStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -6421,7 +6419,7 @@
 
   case 449:
 /* Line 661 of lalr1.cc  */
-#line 4329 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4327 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -6433,7 +6431,7 @@
 
   case 450:
 /* Line 661 of lalr1.cc  */
-#line 4342 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4340 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<ForwardAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node)
@@ -6443,7 +6441,7 @@
 
   case 451:
 /* Line 661 of lalr1.cc  */
-#line 4348 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4346 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<AbbrevForwardStep*>((yysemantic_stack_[(1) - (1)].node))
@@ -6453,7 +6451,7 @@
 
   case 452:
 /* Line 661 of lalr1.cc  */
-#line 4359 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4357 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_child );
         }
@@ -6461,7 +6459,7 @@
 
   case 453:
 /* Line 661 of lalr1.cc  */
-#line 4363 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4361 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_descendant);
         }
@@ -6469,7 +6467,7 @@
 
   case 454:
 /* Line 661 of lalr1.cc  */
-#line 4367 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4365 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_attribute );
         }
@@ -6477,7 +6475,7 @@
 
   case 455:
 /* Line 661 of lalr1.cc  */
-#line 4371 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4369 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_self );
         }
@@ -6485,7 +6483,7 @@
 
   case 456:
 /* Line 661 of lalr1.cc  */
-#line 4375 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4373 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_descendant_or_self
@@ -6495,7 +6493,7 @@
 
   case 457:
 /* Line 661 of lalr1.cc  */
-#line 4381 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4379 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_following_sibling
@@ -6505,7 +6503,7 @@
 
   case 458:
 /* Line 661 of lalr1.cc  */
-#line 4387 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4385 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_following );
         }
@@ -6513,7 +6511,7 @@
 
   case 459:
 /* Line 661 of lalr1.cc  */
-#line 4396 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4394 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), false );
         }
@@ -6521,7 +6519,7 @@
 
   case 460:
 /* Line 661 of lalr1.cc  */
-#line 4400 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4398 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].node), true );
         }
@@ -6529,7 +6527,7 @@
 
   case 461:
 /* Line 661 of lalr1.cc  */
-#line 4409 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4407 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseStep( LOC((yyloc)), dynamic_cast<ReverseAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node) );
         }
@@ -6537,7 +6535,7 @@
 
   case 462:
 /* Line 661 of lalr1.cc  */
-#line 4413 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4411 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             ReverseAxis *ra = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_parent
@@ -6548,7 +6546,7 @@
 
   case 463:
 /* Line 661 of lalr1.cc  */
-#line 4425 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4423 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_parent );
         }
@@ -6556,7 +6554,7 @@
 
   case 464:
 /* Line 661 of lalr1.cc  */
-#line 4429 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4427 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_ancestor );
         }
@@ -6564,7 +6562,7 @@
 
   case 465:
 /* Line 661 of lalr1.cc  */
-#line 4433 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4431 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_preceding_sibling
@@ -6574,7 +6572,7 @@
 
   case 466:
 /* Line 661 of lalr1.cc  */
-#line 4439 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4437 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_preceding );
         }
@@ -6582,7 +6580,7 @@
 
   case 467:
 /* Line 661 of lalr1.cc  */
-#line 4443 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4441 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_ancestor_or_self
@@ -6592,7 +6590,7 @@
 
   case 470:
 /* Line 661 of lalr1.cc  */
-#line 4465 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4463 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -6600,7 +6598,7 @@
 
   case 471:
 /* Line 661 of lalr1.cc  */
-#line 4469 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4467 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
@@ -6608,7 +6606,7 @@
 
   case 472:
 /* Line 661 of lalr1.cc  */
-#line 4479 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4477 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
@@ -6616,7 +6614,7 @@
 
   case 473:
 /* Line 661 of lalr1.cc  */
-#line 4483 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4481 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
@@ -6624,7 +6622,7 @@
 
   case 474:
 /* Line 661 of lalr1.cc  */
-#line 4487 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4485 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
@@ -6632,7 +6630,7 @@
 
   case 475:
 /* Line 661 of lalr1.cc  */
-#line 4491 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4489 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
@@ -6640,7 +6638,7 @@
 
   case 476:
 /* Line 661 of lalr1.cc  */
-#line 4504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4502 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
@@ -6648,7 +6646,7 @@
 
   case 477:
 /* Line 661 of lalr1.cc  */
-#line 4508 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4506 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
      }
@@ -6656,7 +6654,7 @@
 
   case 478:
 /* Line 661 of lalr1.cc  */
-#line 4512 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4510 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
      }
@@ -6664,7 +6662,7 @@
 
   case 479:
 /* Line 661 of lalr1.cc  */
-#line 4516 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4514 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)), false);
      }
@@ -6672,7 +6670,7 @@
 
   case 480:
 /* Line 661 of lalr1.cc  */
-#line 4522 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4520 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new JSONArrayUnboxing(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
     }
@@ -6680,7 +6678,7 @@
 
   case 481:
 /* Line 661 of lalr1.cc  */
-#line 4526 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4524 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(3) - (3)].expr), (yylocation_stack_[(3) - (3)]));
        StringLiteral* sl = new StringLiteral( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
@@ -6690,7 +6688,7 @@
 
   case 482:
 /* Line 661 of lalr1.cc  */
-#line 4532 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4530 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), LOC((yylocation_stack_[(4) - (2)])),
                                  (yysemantic_stack_[(4) - (1)].expr),
@@ -6700,7 +6698,7 @@
 
   case 483:
 /* Line 661 of lalr1.cc  */
-#line 4538 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4536 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), LOC((yylocation_stack_[(5) - (2)])),
                                  (yysemantic_stack_[(5) - (1)].expr),
@@ -6710,7 +6708,7 @@
 
   case 484:
 /* Line 661 of lalr1.cc  */
-#line 4544 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4542 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), LOC((yylocation_stack_[(3) - (2)])), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -6718,7 +6716,7 @@
 
   case 485:
 /* Line 661 of lalr1.cc  */
-#line 4548 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4546 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), LOC((yylocation_stack_[(3) - (2)])), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -6726,7 +6724,7 @@
 
   case 486:
 /* Line 661 of lalr1.cc  */
-#line 4552 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4550 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), LOC((yylocation_stack_[(3) - (2)])), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -6734,7 +6732,7 @@
 
   case 487:
 /* Line 661 of lalr1.cc  */
-#line 4561 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4559 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       PredicateList* pl = new PredicateList( LOC((yyloc)) );
       pl->push_back(dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)));
@@ -6744,7 +6742,7 @@
 
   case 488:
 /* Line 661 of lalr1.cc  */
-#line 4567 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4565 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (PredicateList* pl = dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (1)].node)))
         pl->push_back(dynamic_cast<exprnode*>((yysemantic_stack_[(2) - (2)].expr)));
@@ -6755,7 +6753,7 @@
 
   case 489:
 /* Line 661 of lalr1.cc  */
-#line 4578 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4576 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -6763,7 +6761,7 @@
 
   case 504:
 /* Line 661 of lalr1.cc  */
-#line 4606 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4604 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6771,7 +6769,7 @@
 
   case 505:
 /* Line 661 of lalr1.cc  */
-#line 4610 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4608 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6779,7 +6777,7 @@
 
   case 506:
 /* Line 661 of lalr1.cc  */
-#line 4618 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4616 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -6790,7 +6788,7 @@
 
   case 507:
 /* Line 661 of lalr1.cc  */
-#line 4625 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4623 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -6801,7 +6799,7 @@
 
   case 508:
 /* Line 661 of lalr1.cc  */
-#line 4632 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4630 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -6812,7 +6810,7 @@
 
   case 509:
 /* Line 661 of lalr1.cc  */
-#line 4643 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4641 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
@@ -6820,7 +6818,7 @@
 
   case 510:
 /* Line 661 of lalr1.cc  */
-#line 4651 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4649 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
@@ -6828,7 +6826,7 @@
 
   case 511:
 /* Line 661 of lalr1.cc  */
-#line 4655 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4653 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -6836,7 +6834,7 @@
 
   case 512:
 /* Line 661 of lalr1.cc  */
-#line 4663 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4661 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
             driver.addCommonLanguageWarning((yylocation_stack_[(1) - (1)]), ZED(ZWST0009_CONTEXT_ITEM_EXPR));
@@ -6846,7 +6844,7 @@
 
   case 513:
 /* Line 661 of lalr1.cc  */
-#line 4674 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4672 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6854,7 +6852,7 @@
 
   case 514:
 /* Line 661 of lalr1.cc  */
-#line 4682 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4680 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6862,7 +6860,7 @@
 
   case 515:
 /* Line 661 of lalr1.cc  */
-#line 4688 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4686 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FunctionCall(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL);
     }
@@ -6870,7 +6868,7 @@
 
   case 516:
 /* Line 661 of lalr1.cc  */
-#line 4692 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4690 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
 
@@ -6892,7 +6890,7 @@
 
   case 517:
 /* Line 661 of lalr1.cc  */
-#line 4714 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4712 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList* al = new ArgList(LOC((yyloc)));
       al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -6902,7 +6900,7 @@
 
   case 518:
 /* Line 661 of lalr1.cc  */
-#line 4720 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4718 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (ArgList* al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)))
         al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -6912,7 +6910,7 @@
 
   case 519:
 /* Line 661 of lalr1.cc  */
-#line 4726 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4724 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -6922,7 +6920,7 @@
 
   case 520:
 /* Line 661 of lalr1.cc  */
-#line 4732 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4730 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
         al->push_back( (yysemantic_stack_[(3) - (3)].expr) );
@@ -6932,7 +6930,7 @@
 
   case 521:
 /* Line 661 of lalr1.cc  */
-#line 4742 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4740 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6940,7 +6938,7 @@
 
   case 522:
 /* Line 661 of lalr1.cc  */
-#line 4746 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4744 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6948,7 +6946,7 @@
 
   case 523:
 /* Line 661 of lalr1.cc  */
-#line 4754 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4752 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new LiteralFunctionItem(LOC ((yyloc)), dynamic_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].ival));
     }
@@ -6956,7 +6954,7 @@
 
   case 524:
 /* Line 661 of lalr1.cc  */
-#line 4762 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4760 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -6968,7 +6966,7 @@
 
   case 530:
 /* Line 661 of lalr1.cc  */
-#line 4787 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4785 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -6980,7 +6978,7 @@
 
   case 531:
 /* Line 661 of lalr1.cc  */
-#line 4795 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4793 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(8) - (6)].expr))->get_qname())
       {
@@ -7001,7 +6999,7 @@
 
   case 532:
 /* Line 661 of lalr1.cc  */
-#line 4812 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4810 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7013,7 +7011,7 @@
 
   case 533:
 /* Line 661 of lalr1.cc  */
-#line 4820 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4818 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
       {
@@ -7034,7 +7032,7 @@
 
   case 534:
 /* Line 661 of lalr1.cc  */
-#line 4839 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4837 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
       {
@@ -7055,7 +7053,7 @@
 
   case 535:
 /* Line 661 of lalr1.cc  */
-#line 4858 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4856 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       if (static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr))->get_qname())
       {
@@ -7076,7 +7074,7 @@
 
   case 536:
 /* Line 661 of lalr1.cc  */
-#line 4880 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4878 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
       decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7086,7 +7084,7 @@
 
   case 537:
 /* Line 661 of lalr1.cc  */
-#line 4886 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4884 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( decl )
@@ -7097,7 +7095,7 @@
 
   case 538:
 /* Line 661 of lalr1.cc  */
-#line 4897 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4895 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
       dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7107,7 +7105,7 @@
 
   case 539:
 /* Line 661 of lalr1.cc  */
-#line 4903 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4901 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
       if ( dal )
@@ -7118,7 +7116,7 @@
 
   case 540:
 /* Line 661 of lalr1.cc  */
-#line 4914 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4912 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttr(LOC((yyloc)),
                        static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7128,7 +7126,7 @@
 
   case 543:
 /* Line 661 of lalr1.cc  */
-#line 4929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue(LOC((yyloc)),
                                  dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7137,7 +7135,7 @@
 
   case 544:
 /* Line 661 of lalr1.cc  */
-#line 4934 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                   dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7146,7 +7144,7 @@
 
   case 545:
 /* Line 661 of lalr1.cc  */
-#line 4943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4941 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
     }
@@ -7154,7 +7152,7 @@
 
   case 546:
 /* Line 661 of lalr1.cc  */
-#line 4947 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4945 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7162,7 +7160,7 @@
 
   case 547:
 /* Line 661 of lalr1.cc  */
-#line 4954 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7172,7 +7170,7 @@
 
   case 548:
 /* Line 661 of lalr1.cc  */
-#line 4960 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4958 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7182,7 +7180,7 @@
 
   case 549:
 /* Line 661 of lalr1.cc  */
-#line 4966 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4964 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7193,7 +7191,7 @@
 
   case 550:
 /* Line 661 of lalr1.cc  */
-#line 4973 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4971 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7204,7 +7202,7 @@
 
   case 551:
 /* Line 661 of lalr1.cc  */
-#line 4984 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4982 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
     }
@@ -7212,7 +7210,7 @@
 
   case 552:
 /* Line 661 of lalr1.cc  */
-#line 4988 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4986 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7220,7 +7218,7 @@
 
   case 553:
 /* Line 661 of lalr1.cc  */
-#line 4995 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4993 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7230,7 +7228,7 @@
 
   case 554:
 /* Line 661 of lalr1.cc  */
-#line 5001 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 4999 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7240,7 +7238,7 @@
 
   case 555:
 /* Line 661 of lalr1.cc  */
-#line 5007 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5005 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if (aacl)
@@ -7251,7 +7249,7 @@
 
   case 556:
 /* Line 661 of lalr1.cc  */
-#line 5014 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5012 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( aacl )
@@ -7262,7 +7260,7 @@
 
   case 557:
 /* Line 661 of lalr1.cc  */
-#line 5025 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5023 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7270,7 +7268,7 @@
 
   case 558:
 /* Line 661 of lalr1.cc  */
-#line 5029 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5027 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7278,7 +7276,7 @@
 
   case 559:
 /* Line 661 of lalr1.cc  */
-#line 5037 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5035 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7286,7 +7284,7 @@
 
   case 560:
 /* Line 661 of lalr1.cc  */
-#line 5041 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5039 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7294,7 +7292,7 @@
 
   case 561:
 /* Line 661 of lalr1.cc  */
-#line 5049 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5047 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
     }
@@ -7302,7 +7300,7 @@
 
   case 562:
 /* Line 661 of lalr1.cc  */
-#line 5053 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5051 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7310,7 +7308,7 @@
 
   case 563:
 /* Line 661 of lalr1.cc  */
-#line 5057 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5055 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       rchandle<CDataSection> cdata_h = dynamic_cast<CDataSection*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = new DirElemContent( LOC((yyloc)), cdata_h );
@@ -7319,7 +7317,7 @@
 
   case 564:
 /* Line 661 of lalr1.cc  */
-#line 5062 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5060 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       rchandle<CommonContent> cont_h = dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = new DirElemContent( LOC((yyloc)), cont_h );
@@ -7328,7 +7326,7 @@
 
   case 565:
 /* Line 661 of lalr1.cc  */
-#line 5071 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5069 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
     }
@@ -7336,7 +7334,7 @@
 
   case 566:
 /* Line 661 of lalr1.cc  */
-#line 5075 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5073 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
     }
@@ -7344,7 +7342,7 @@
 
   case 567:
 /* Line 661 of lalr1.cc  */
-#line 5079 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5077 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
     }
@@ -7352,7 +7350,7 @@
 
   case 568:
 /* Line 661 of lalr1.cc  */
-#line 5083 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5081 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
     }
@@ -7360,7 +7358,7 @@
 
   case 569:
 /* Line 661 of lalr1.cc  */
-#line 5091 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5089 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7368,7 +7366,7 @@
 
   case 570:
 /* Line 661 of lalr1.cc  */
-#line 5096 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5094 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
@@ -7376,7 +7374,7 @@
 
   case 571:
 /* Line 661 of lalr1.cc  */
-#line 5104 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5102 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(3) - (2)].expr), (yylocation_stack_[(3) - (2)]));
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)) );
@@ -7385,7 +7383,7 @@
 
   case 572:
 /* Line 661 of lalr1.cc  */
-#line 5110 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5108 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(3) - (2)].expr), (yylocation_stack_[(3) - (2)]));
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -7394,7 +7392,7 @@
 
   case 573:
 /* Line 661 of lalr1.cc  */
-#line 5119 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5117 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -7402,7 +7400,7 @@
 
   case 574:
 /* Line 661 of lalr1.cc  */
-#line 5127 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5125 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7410,7 +7408,7 @@
 
   case 575:
 /* Line 661 of lalr1.cc  */
-#line 5132 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5130 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7418,7 +7416,7 @@
 
   case 576:
 /* Line 661 of lalr1.cc  */
-#line 5137 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5135 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7426,7 +7424,7 @@
 
   case 577:
 /* Line 661 of lalr1.cc  */
-#line 5142 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5140 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7434,7 +7432,7 @@
 
   case 578:
 /* Line 661 of lalr1.cc  */
-#line 5147 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5145 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7442,7 +7440,7 @@
 
   case 579:
 /* Line 661 of lalr1.cc  */
-#line 5152 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5150 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7450,7 +7448,7 @@
 
   case 581:
 /* Line 661 of lalr1.cc  */
-#line 5163 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5161 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -7458,7 +7456,7 @@
 
   case 582:
 /* Line 661 of lalr1.cc  */
-#line 5171 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5169 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -7466,7 +7464,7 @@
 
   case 583:
 /* Line 661 of lalr1.cc  */
-#line 5175 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5173 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -7474,7 +7472,7 @@
 
   case 584:
 /* Line 661 of lalr1.cc  */
-#line 5181 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5179 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
     }
@@ -7482,7 +7480,7 @@
 
   case 585:
 /* Line 661 of lalr1.cc  */
-#line 5185 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5183 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -7490,7 +7488,7 @@
 
   case 586:
 /* Line 661 of lalr1.cc  */
-#line 5193 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5191 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -7498,7 +7496,7 @@
 
   case 587:
 /* Line 661 of lalr1.cc  */
-#line 5201 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5199 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -7506,7 +7504,7 @@
 
   case 588:
 /* Line 661 of lalr1.cc  */
-#line 5209 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5207 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -7514,7 +7512,7 @@
 
   case 589:
 /* Line 661 of lalr1.cc  */
-#line 5213 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5211 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -7522,7 +7520,7 @@
 
   case 590:
 /* Line 661 of lalr1.cc  */
-#line 5221 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5219 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -7530,7 +7528,7 @@
 
   case 591:
 /* Line 661 of lalr1.cc  */
-#line 5225 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5223 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -7538,7 +7536,7 @@
 
   case 592:
 /* Line 661 of lalr1.cc  */
-#line 5233 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5231 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -7546,7 +7544,7 @@
 
   case 593:
 /* Line 661 of lalr1.cc  */
-#line 5241 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5239 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceTypeAST( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
@@ -7554,7 +7552,7 @@
 
   case 594:
 /* Line 661 of lalr1.cc  */
-#line 5245 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5243 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceTypeAST(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
         }
@@ -7562,7 +7560,7 @@
 
   case 595:
 /* Line 661 of lalr1.cc  */
-#line 5249 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5247 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceTypeAST( LOC((yyloc)), NULL, NULL );
         }
@@ -7570,7 +7568,7 @@
 
   case 596:
 /* Line 661 of lalr1.cc  */
-#line 5255 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5253 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
 
             driver.addCommonLanguageWarning((yylocation_stack_[(2) - (1)]), ZED(ZWST0009_JSONIQ_EMPTY_SEQUENCE));
@@ -7580,7 +7578,7 @@
 
   case 597:
 /* Line 661 of lalr1.cc  */
-#line 5264 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5262 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -7590,7 +7588,7 @@
 
   case 598:
 /* Line 661 of lalr1.cc  */
-#line 5270 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5268 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -7600,7 +7598,7 @@
 
   case 599:
 /* Line 661 of lalr1.cc  */
-#line 5276 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5274 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -7610,7 +7608,7 @@
 
   case 600:
 /* Line 661 of lalr1.cc  */
-#line 5286 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5284 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             GeneralizedAtomicType* gat = static_cast<GeneralizedAtomicType*>((yysemantic_stack_[(1) - (1)].node));
             QName* q = gat->get_qname();
@@ -7658,7 +7656,7 @@
 
   case 601:
 /* Line 661 of lalr1.cc  */
-#line 5330 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5328 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7666,7 +7664,7 @@
 
   case 602:
 /* Line 661 of lalr1.cc  */
-#line 5334 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5332 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -7674,7 +7672,7 @@
 
   case 603:
 /* Line 661 of lalr1.cc  */
-#line 5338 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5336 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -7682,7 +7680,7 @@
 
   case 604:
 /* Line 661 of lalr1.cc  */
-#line 5342 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5340 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7690,7 +7688,7 @@
 
   case 605:
 /* Line 661 of lalr1.cc  */
-#line 5346 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5344 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7698,7 +7696,7 @@
 
   case 606:
 /* Line 661 of lalr1.cc  */
-#line 5350 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5348 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7706,7 +7704,7 @@
 
   case 607:
 /* Line 661 of lalr1.cc  */
-#line 5357 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5355 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceTypeAST *>((yysemantic_stack_[(1) - (1)].node)));
@@ -7716,7 +7714,7 @@
 
   case 608:
 /* Line 661 of lalr1.cc  */
-#line 5363 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5361 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
           aTypeList->push_back(dynamic_cast<SequenceTypeAST *>((yysemantic_stack_[(3) - (3)].node)));
@@ -7726,7 +7724,7 @@
 
   case 609:
 /* Line 661 of lalr1.cc  */
-#line 5373 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5371 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -7734,7 +7732,7 @@
 
   case 610:
 /* Line 661 of lalr1.cc  */
-#line 5381 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5379 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -7742,7 +7740,7 @@
 
   case 611:
 /* Line 661 of lalr1.cc  */
-#line 5389 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5387 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7750,7 +7748,7 @@
 
   case 612:
 /* Line 661 of lalr1.cc  */
-#line 5393 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5391 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7758,7 +7756,7 @@
 
   case 613:
 /* Line 661 of lalr1.cc  */
-#line 5397 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5395 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7766,7 +7764,7 @@
 
   case 614:
 /* Line 661 of lalr1.cc  */
-#line 5401 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5399 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7774,7 +7772,7 @@
 
   case 615:
 /* Line 661 of lalr1.cc  */
-#line 5405 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5403 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7782,7 +7780,7 @@
 
   case 616:
 /* Line 661 of lalr1.cc  */
-#line 5409 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5407 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7790,7 +7788,7 @@
 
   case 617:
 /* Line 661 of lalr1.cc  */
-#line 5413 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5411 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7798,7 +7796,7 @@
 
   case 618:
 /* Line 661 of lalr1.cc  */
-#line 5417 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5415 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7806,7 +7804,7 @@
 
   case 619:
 /* Line 661 of lalr1.cc  */
-#line 5421 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5419 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7814,7 +7812,7 @@
 
   case 620:
 /* Line 661 of lalr1.cc  */
-#line 5425 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5423 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7822,7 +7820,7 @@
 
   case 621:
 /* Line 661 of lalr1.cc  */
-#line 5433 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5431 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyKindTest( LOC((yyloc)) );
     }
@@ -7830,7 +7828,7 @@
 
   case 622:
 /* Line 661 of lalr1.cc  */
-#line 5440 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5438 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -7838,7 +7836,7 @@
 
   case 623:
 /* Line 661 of lalr1.cc  */
-#line 5447 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5445 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)));
     }
@@ -7846,7 +7844,7 @@
 
   case 624:
 /* Line 661 of lalr1.cc  */
-#line 5451 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5449 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -7854,7 +7852,7 @@
 
   case 625:
 /* Line 661 of lalr1.cc  */
-#line 5455 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5453 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -7862,7 +7860,7 @@
 
   case 626:
 /* Line 661 of lalr1.cc  */
-#line 5463 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5461 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new NamespaceTest(LOC((yyloc)));
     }
@@ -7870,7 +7868,7 @@
 
   case 627:
 /* Line 661 of lalr1.cc  */
-#line 5470 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5468 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new TextTest(LOC((yyloc)));
     }
@@ -7878,7 +7876,7 @@
 
   case 628:
 /* Line 661 of lalr1.cc  */
-#line 5478 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5476 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CommentTest(LOC((yyloc)));
     }
@@ -7886,7 +7884,7 @@
 
   case 629:
 /* Line 661 of lalr1.cc  */
-#line 5486 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5484 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
@@ -7894,7 +7892,7 @@
 
   case 630:
 /* Line 661 of lalr1.cc  */
-#line 5490 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5488 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(4) - (3)].expr), (yylocation_stack_[(4) - (3)]));
             (yyval.node) = new PITest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
@@ -7903,7 +7901,7 @@
 
   case 631:
 /* Line 661 of lalr1.cc  */
-#line 5495 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5493 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -7911,7 +7909,7 @@
 
   case 632:
 /* Line 661 of lalr1.cc  */
-#line 5503 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5501 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -7919,7 +7917,7 @@
 
   case 633:
 /* Line 661 of lalr1.cc  */
-#line 5507 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5505 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -7929,7 +7927,7 @@
 
   case 634:
 /* Line 661 of lalr1.cc  */
-#line 5513 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5511 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -7939,7 +7937,7 @@
 
   case 635:
 /* Line 661 of lalr1.cc  */
-#line 5519 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5517 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -7947,7 +7945,7 @@
 
   case 636:
 /* Line 661 of lalr1.cc  */
-#line 5523 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5521 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -7957,7 +7955,7 @@
 
   case 637:
 /* Line 661 of lalr1.cc  */
-#line 5533 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5531 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -7965,7 +7963,7 @@
 
   case 638:
 /* Line 661 of lalr1.cc  */
-#line 5541 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5539 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
@@ -7973,7 +7971,7 @@
 
   case 639:
 /* Line 661 of lalr1.cc  */
-#line 5545 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5543 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -7983,7 +7981,7 @@
 
   case 640:
 /* Line 661 of lalr1.cc  */
-#line 5551 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5549 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -7996,7 +7994,7 @@
 
   case 641:
 /* Line 661 of lalr1.cc  */
-#line 5560 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5558 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8009,7 +8007,7 @@
 
   case 642:
 /* Line 661 of lalr1.cc  */
-#line 5569 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5567 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8019,7 +8017,7 @@
 
   case 643:
 /* Line 661 of lalr1.cc  */
-#line 5575 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5573 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8029,7 +8027,7 @@
 
   case 644:
 /* Line 661 of lalr1.cc  */
-#line 5581 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5579 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8039,7 +8037,7 @@
 
   case 645:
 /* Line 661 of lalr1.cc  */
-#line 5591 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5589 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8047,7 +8045,7 @@
 
   case 646:
 /* Line 661 of lalr1.cc  */
-#line 5597 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5595 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -8055,7 +8053,7 @@
 
   case 647:
 /* Line 661 of lalr1.cc  */
-#line 5604 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5602 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
         }
@@ -8063,7 +8061,7 @@
 
   case 648:
 /* Line 661 of lalr1.cc  */
-#line 5610 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5608 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8071,7 +8069,7 @@
 
   case 649:
 /* Line 661 of lalr1.cc  */
-#line 5616 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5614 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8079,7 +8077,7 @@
 
   case 650:
 /* Line 661 of lalr1.cc  */
-#line 5620 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5618 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8087,7 +8085,7 @@
 
   case 651:
 /* Line 661 of lalr1.cc  */
-#line 5628 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5626 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
@@ -8095,7 +8093,7 @@
 
   case 652:
 /* Line 661 of lalr1.cc  */
-#line 5636 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5634 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceTypeAST *>((yysemantic_stack_[(5) - (5)].node)));
         }
@@ -8103,7 +8101,7 @@
 
   case 653:
 /* Line 661 of lalr1.cc  */
-#line 5640 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5638 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8113,7 +8111,7 @@
 
   case 654:
 /* Line 661 of lalr1.cc  */
-#line 5651 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5649 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8121,7 +8119,7 @@
 
   case 655:
 /* Line 661 of lalr1.cc  */
-#line 5657 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5655 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8131,7 +8129,7 @@
 
   case 656:
 /* Line 661 of lalr1.cc  */
-#line 5663 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5661 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8141,7 +8139,7 @@
 
   case 657:
 /* Line 661 of lalr1.cc  */
-#line 5669 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5667 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8151,7 +8149,7 @@
 
   case 658:
 /* Line 661 of lalr1.cc  */
-#line 5679 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5677 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8159,7 +8157,7 @@
 
   case 659:
 /* Line 661 of lalr1.cc  */
-#line 5683 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5681 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8169,7 +8167,7 @@
 
   case 660:
 /* Line 661 of lalr1.cc  */
-#line 5689 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5687 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8179,7 +8177,7 @@
 
   case 661:
 /* Line 661 of lalr1.cc  */
-#line 5695 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5693 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8187,7 +8185,7 @@
 
   case 662:
 /* Line 661 of lalr1.cc  */
-#line 5699 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5697 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8197,7 +8195,7 @@
 
   case 663:
 /* Line 661 of lalr1.cc  */
-#line 5705 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5703 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8205,7 +8203,7 @@
 
   case 664:
 /* Line 661 of lalr1.cc  */
-#line 5709 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5707 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8215,7 +8213,7 @@
 
   case 665:
 /* Line 661 of lalr1.cc  */
-#line 5715 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5713 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                   LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8225,7 +8223,7 @@
 
   case 666:
 /* Line 661 of lalr1.cc  */
-#line 5721 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5719 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -8236,7 +8234,7 @@
 
   case 667:
 /* Line 661 of lalr1.cc  */
-#line 5728 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5726 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8246,7 +8244,7 @@
 
   case 668:
 /* Line 661 of lalr1.cc  */
-#line 5738 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5736 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8254,7 +8252,7 @@
 
   case 669:
 /* Line 661 of lalr1.cc  */
-#line 5743 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5741 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8262,7 +8260,7 @@
 
   case 670:
 /* Line 661 of lalr1.cc  */
-#line 5751 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5749 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::NODE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8272,7 +8270,7 @@
 
   case 671:
 /* Line 661 of lalr1.cc  */
-#line 5757 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5755 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::VALUE_OF_NODE, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8282,7 +8280,7 @@
 
   case 672:
 /* Line 661 of lalr1.cc  */
-#line 5767 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5765 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8290,7 +8288,7 @@
 
   case 673:
 /* Line 661 of lalr1.cc  */
-#line 5773 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5771 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CopyVarList *cvl = dynamic_cast<CopyVarList*>((yysemantic_stack_[(7) - (3)].expr));
       (yyval.expr) = new TransformExpr( LOC((yyloc)), cvl, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr) );
@@ -8299,7 +8297,7 @@
 
   case 674:
 /* Line 661 of lalr1.cc  */
-#line 5782 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5780 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -8309,7 +8307,7 @@
 
   case 675:
 /* Line 661 of lalr1.cc  */
-#line 5788 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5786 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       CopyVarList* lList = dynamic_cast<CopyVarList*>((yysemantic_stack_[(4) - (1)].expr));
       VarBinding* lBinding = dynamic_cast<VarBinding*>((yysemantic_stack_[(4) - (4)].expr));
@@ -8320,7 +8318,7 @@
 
   case 676:
 /* Line 661 of lalr1.cc  */
-#line 5801 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5799 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new VarBinding(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -8328,7 +8326,7 @@
 
   case 677:
 /* Line 661 of lalr1.cc  */
-#line 5807 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5805 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8336,7 +8334,7 @@
 
   case 678:
 /* Line 661 of lalr1.cc  */
-#line 5814 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5812 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -8346,7 +8344,7 @@
 
   case 679:
 /* Line 661 of lalr1.cc  */
-#line 5820 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5818 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -8357,7 +8355,7 @@
 
   case 680:
 /* Line 661 of lalr1.cc  */
-#line 5830 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5828 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/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);
@@ -8366,7 +8364,7 @@
 
   case 681:
 /* Line 661 of lalr1.cc  */
-#line 5839 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5837 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -8374,7 +8372,7 @@
 
   case 682:
 /* Line 661 of lalr1.cc  */
-#line 5847 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5845 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -8384,7 +8382,7 @@
 
   case 683:
 /* Line 661 of lalr1.cc  */
-#line 5853 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5851 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -8395,7 +8393,7 @@
 
   case 684:
 /* Line 661 of lalr1.cc  */
-#line 5862 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5860 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTSelection( LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), (yysemantic_stack_[(2) - (2)].pos_filter_list) );
             delete (yysemantic_stack_[(2) - (2)].pos_filter_list);
@@ -8404,7 +8402,7 @@
 
   case 685:
 /* Line 661 of lalr1.cc  */
-#line 5870 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5868 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = NULL;
         }
@@ -8412,7 +8410,7 @@
 
   case 686:
 /* Line 661 of lalr1.cc  */
-#line 5874 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5872 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
@@ -8420,7 +8418,7 @@
 
   case 687:
 /* Line 661 of lalr1.cc  */
-#line 5881 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5879 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = new FTSelection::pos_filter_list_t;
             (yyval.pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -8429,7 +8427,7 @@
 
   case 688:
 /* Line 661 of lalr1.cc  */
-#line 5886 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5884 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yysemantic_stack_[(2) - (1)].pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(2) - (2)].node)) );
             (yyval.pos_filter_list) = (yysemantic_stack_[(2) - (1)].pos_filter_list);
@@ -8438,7 +8436,7 @@
 
   case 689:
 /* Line 661 of lalr1.cc  */
-#line 5894 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5892 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8446,7 +8444,7 @@
 
   case 690:
 /* Line 661 of lalr1.cc  */
-#line 5898 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5896 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -8454,7 +8452,7 @@
 
   case 691:
 /* Line 661 of lalr1.cc  */
-#line 5905 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5903 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8462,7 +8460,7 @@
 
   case 692:
 /* Line 661 of lalr1.cc  */
-#line 5909 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5907 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -8470,7 +8468,7 @@
 
   case 693:
 /* Line 661 of lalr1.cc  */
-#line 5916 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5914 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8478,7 +8476,7 @@
 
   case 694:
 /* Line 661 of lalr1.cc  */
-#line 5920 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
         }
@@ -8486,7 +8484,7 @@
 
   case 695:
 /* Line 661 of lalr1.cc  */
-#line 5927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8494,7 +8492,7 @@
 
   case 696:
 /* Line 661 of lalr1.cc  */
-#line 5931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -8504,7 +8502,7 @@
 
   case 697:
 /* Line 661 of lalr1.cc  */
-#line 5940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5938 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -8517,7 +8515,7 @@
 
   case 698:
 /* Line 661 of lalr1.cc  */
-#line 5952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5950 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -8525,7 +8523,7 @@
 
   case 699:
 /* Line 661 of lalr1.cc  */
-#line 5956 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5954 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8533,7 +8531,7 @@
 
   case 700:
 /* Line 661 of lalr1.cc  */
-#line 5963 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5961 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -8541,7 +8539,7 @@
 
   case 701:
 /* Line 661 of lalr1.cc  */
-#line 5967 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5965 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8549,7 +8547,7 @@
 
   case 702:
 /* Line 661 of lalr1.cc  */
-#line 5975 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5973 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8557,7 +8555,7 @@
 
   case 703:
 /* Line 661 of lalr1.cc  */
-#line 5983 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5981 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -8569,7 +8567,7 @@
 
   case 704:
 /* Line 661 of lalr1.cc  */
-#line 5991 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5989 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8577,7 +8575,7 @@
 
   case 705:
 /* Line 661 of lalr1.cc  */
-#line 5995 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 5993 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8585,7 +8583,7 @@
 
   case 706:
 /* Line 661 of lalr1.cc  */
-#line 6002 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6000 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -8593,7 +8591,7 @@
 
   case 707:
 /* Line 661 of lalr1.cc  */
-#line 6006 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6004 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8601,7 +8599,7 @@
 
   case 708:
 /* Line 661 of lalr1.cc  */
-#line 6014 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6012 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -8613,7 +8611,7 @@
 
   case 709:
 /* Line 661 of lalr1.cc  */
-#line 6025 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6023 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -8621,7 +8619,7 @@
 
   case 710:
 /* Line 661 of lalr1.cc  */
-#line 6029 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6027 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8629,7 +8627,7 @@
 
   case 711:
 /* Line 661 of lalr1.cc  */
-#line 6037 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6035 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -8641,7 +8639,7 @@
 
   case 712:
 /* Line 661 of lalr1.cc  */
-#line 6049 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6047 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -8651,7 +8649,7 @@
 
   case 713:
 /* Line 661 of lalr1.cc  */
-#line 6055 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6053 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -8661,7 +8659,7 @@
 
   case 714:
 /* Line 661 of lalr1.cc  */
-#line 6064 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6062 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
@@ -8669,7 +8667,7 @@
 
   case 715:
 /* Line 661 of lalr1.cc  */
-#line 6068 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6066 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8677,7 +8675,7 @@
 
   case 716:
 /* Line 661 of lalr1.cc  */
-#line 6076 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6074 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -8685,7 +8683,7 @@
 
   case 717:
 /* Line 661 of lalr1.cc  */
-#line 6080 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6078 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -8693,7 +8691,7 @@
 
   case 718:
 /* Line 661 of lalr1.cc  */
-#line 6084 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6082 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
@@ -8701,7 +8699,7 @@
 
   case 719:
 /* Line 661 of lalr1.cc  */
-#line 6091 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6089 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
@@ -8709,7 +8707,7 @@
 
   case 720:
 /* Line 661 of lalr1.cc  */
-#line 6095 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6093 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
@@ -8717,7 +8715,7 @@
 
   case 721:
 /* Line 661 of lalr1.cc  */
-#line 6102 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6100 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
@@ -8725,7 +8723,7 @@
 
   case 722:
 /* Line 661 of lalr1.cc  */
-#line 6106 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6104 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
@@ -8733,7 +8731,7 @@
 
   case 723:
 /* Line 661 of lalr1.cc  */
-#line 6114 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6112 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8741,7 +8739,7 @@
 
   case 724:
 /* Line 661 of lalr1.cc  */
-#line 6118 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6116 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8749,7 +8747,7 @@
 
   case 725:
 /* Line 661 of lalr1.cc  */
-#line 6122 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6120 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8757,7 +8755,7 @@
 
   case 726:
 /* Line 661 of lalr1.cc  */
-#line 6126 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6124 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8765,7 +8763,7 @@
 
   case 727:
 /* Line 661 of lalr1.cc  */
-#line 6130 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6128 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8773,7 +8771,7 @@
 
   case 728:
 /* Line 661 of lalr1.cc  */
-#line 6138 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6136 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
@@ -8781,7 +8779,7 @@
 
   case 729:
 /* Line 661 of lalr1.cc  */
-#line 6146 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6144 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -8793,7 +8791,7 @@
 
   case 730:
 /* Line 661 of lalr1.cc  */
-#line 6158 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6156 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -8805,7 +8803,7 @@
 
   case 731:
 /* Line 661 of lalr1.cc  */
-#line 6170 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6168 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
@@ -8813,7 +8811,7 @@
 
   case 732:
 /* Line 661 of lalr1.cc  */
-#line 6174 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6172 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
@@ -8821,7 +8819,7 @@
 
   case 733:
 /* Line 661 of lalr1.cc  */
-#line 6178 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6176 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
@@ -8829,7 +8827,7 @@
 
   case 734:
 /* Line 661 of lalr1.cc  */
-#line 6186 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6184 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -8839,7 +8837,7 @@
 
   case 735:
 /* Line 661 of lalr1.cc  */
-#line 6192 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6190 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -8849,7 +8847,7 @@
 
   case 736:
 /* Line 661 of lalr1.cc  */
-#line 6202 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6200 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8857,7 +8855,7 @@
 
   case 737:
 /* Line 661 of lalr1.cc  */
-#line 6206 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6204 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8865,7 +8863,7 @@
 
   case 738:
 /* Line 661 of lalr1.cc  */
-#line 6210 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6208 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8873,7 +8871,7 @@
 
   case 739:
 /* Line 661 of lalr1.cc  */
-#line 6214 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6212 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8881,7 +8879,7 @@
 
   case 740:
 /* Line 661 of lalr1.cc  */
-#line 6218 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6216 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8889,7 +8887,7 @@
 
   case 741:
 /* Line 661 of lalr1.cc  */
-#line 6222 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6220 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8897,7 +8895,7 @@
 
   case 742:
 /* Line 661 of lalr1.cc  */
-#line 6226 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6224 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8905,7 +8903,7 @@
 
   case 743:
 /* Line 661 of lalr1.cc  */
-#line 6230 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6228 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8913,7 +8911,7 @@
 
   case 744:
 /* Line 661 of lalr1.cc  */
-#line 6238 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6236 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
@@ -8921,7 +8919,7 @@
 
   case 745:
 /* Line 661 of lalr1.cc  */
-#line 6242 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6240 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
@@ -8929,7 +8927,7 @@
 
   case 746:
 /* Line 661 of lalr1.cc  */
-#line 6246 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6244 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
@@ -8937,7 +8935,7 @@
 
   case 747:
 /* Line 661 of lalr1.cc  */
-#line 6250 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6248 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
@@ -8945,7 +8943,7 @@
 
   case 748:
 /* Line 661 of lalr1.cc  */
-#line 6258 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6256 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -8955,7 +8953,7 @@
 
   case 749:
 /* Line 661 of lalr1.cc  */
-#line 6264 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6262 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -8965,7 +8963,7 @@
 
   case 750:
 /* Line 661 of lalr1.cc  */
-#line 6274 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6272 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTExtensionOption(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval))
@@ -8975,7 +8973,7 @@
 
   case 751:
 /* Line 661 of lalr1.cc  */
-#line 6284 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6282 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
@@ -8983,7 +8981,7 @@
 
   case 752:
 /* Line 661 of lalr1.cc  */
-#line 6288 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6286 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
@@ -8991,7 +8989,7 @@
 
   case 753:
 /* Line 661 of lalr1.cc  */
-#line 6296 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6294 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9005,7 +9003,7 @@
 
   case 754:
 /* Line 661 of lalr1.cc  */
-#line 6306 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6304 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = (yysemantic_stack_[(5) - (4)].thesaurus_id_list);
             if ( (yysemantic_stack_[(5) - (3)].node) ) {
@@ -9020,7 +9018,7 @@
 
   case 755:
 /* Line 661 of lalr1.cc  */
-#line 6317 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6315 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
@@ -9028,7 +9026,7 @@
 
   case 756:
 /* Line 661 of lalr1.cc  */
-#line 6324 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6322 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9036,7 +9034,7 @@
 
   case 757:
 /* Line 661 of lalr1.cc  */
-#line 6328 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6326 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9044,7 +9042,7 @@
 
   case 758:
 /* Line 661 of lalr1.cc  */
-#line 6335 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6333 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = NULL;
         }
@@ -9052,7 +9050,7 @@
 
   case 759:
 /* Line 661 of lalr1.cc  */
-#line 6339 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6337 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
@@ -9060,7 +9058,7 @@
 
   case 760:
 /* Line 661 of lalr1.cc  */
-#line 6346 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6344 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = new FTThesaurusOption::thesaurus_id_list_t;
             (yyval.thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9069,7 +9067,7 @@
 
   case 761:
 /* Line 661 of lalr1.cc  */
-#line 6351 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6349 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yysemantic_stack_[(3) - (1)].thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(3) - (3)].node)) );
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(3) - (1)].thesaurus_id_list);
@@ -9078,7 +9076,7 @@
 
   case 762:
 /* Line 661 of lalr1.cc  */
-#line 6360 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6358 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTThesaurusID(
                 LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (2)].sval)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), dynamic_cast<FTRange*>((yysemantic_stack_[(4) - (4)].node))
@@ -9088,7 +9086,7 @@
 
   case 763:
 /* Line 661 of lalr1.cc  */
-#line 6369 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6367 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = 0;
         }
@@ -9096,7 +9094,7 @@
 
   case 764:
 /* Line 661 of lalr1.cc  */
-#line 6373 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6371 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
@@ -9104,7 +9102,7 @@
 
   case 765:
 /* Line 661 of lalr1.cc  */
-#line 6380 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6378 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9112,7 +9110,7 @@
 
   case 766:
 /* Line 661 of lalr1.cc  */
-#line 6384 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6382 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -9120,7 +9118,7 @@
 
   case 767:
 /* Line 661 of lalr1.cc  */
-#line 6392 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6390 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -9133,7 +9131,7 @@
 
   case 768:
 /* Line 661 of lalr1.cc  */
-#line 6401 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6399 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, (yysemantic_stack_[(4) - (4)].incl_excl_list), ft_stop_words_mode::with_default
@@ -9144,7 +9142,7 @@
 
   case 769:
 /* Line 661 of lalr1.cc  */
-#line 6408 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6406 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9154,7 +9152,7 @@
 
   case 770:
 /* Line 661 of lalr1.cc  */
-#line 6418 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6416 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
@@ -9162,7 +9160,7 @@
 
   case 771:
 /* Line 661 of lalr1.cc  */
-#line 6422 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6420 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
@@ -9170,7 +9168,7 @@
 
   case 772:
 /* Line 661 of lalr1.cc  */
-#line 6429 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6427 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -9180,7 +9178,7 @@
 
   case 773:
 /* Line 661 of lalr1.cc  */
-#line 6435 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6433 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             if ( (yysemantic_stack_[(3) - (1)].strlist) )
                 (yysemantic_stack_[(3) - (1)].strlist)->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -9190,7 +9188,7 @@
 
   case 774:
 /* Line 661 of lalr1.cc  */
-#line 6444 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6442 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = NULL;
         }
@@ -9198,7 +9196,7 @@
 
   case 775:
 /* Line 661 of lalr1.cc  */
-#line 6448 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6446 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
@@ -9206,7 +9204,7 @@
 
   case 776:
 /* Line 661 of lalr1.cc  */
-#line 6455 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6453 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = new FTStopWordOption::incl_excl_list_t;
             (yyval.incl_excl_list)->push_back( dynamic_cast<FTStopWordsInclExcl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9215,7 +9213,7 @@
 
   case 777:
 /* Line 661 of lalr1.cc  */
-#line 6460 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6458 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -9227,7 +9225,7 @@
 
   case 778:
 /* Line 661 of lalr1.cc  */
-#line 6472 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6470 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9239,7 +9237,7 @@
 
   case 779:
 /* Line 661 of lalr1.cc  */
-#line 6480 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6478 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9251,7 +9249,7 @@
 
   case 780:
 /* Line 661 of lalr1.cc  */
-#line 6492 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6490 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -9259,7 +9257,7 @@
 
   case 781:
 /* Line 661 of lalr1.cc  */
-#line 6500 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6498 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
@@ -9267,7 +9265,7 @@
 
   case 782:
 /* Line 661 of lalr1.cc  */
-#line 6504 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6502 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
@@ -9275,7 +9273,7 @@
 
   case 783:
 /* Line 661 of lalr1.cc  */
-#line 6512 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6510 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
@@ -9283,7 +9281,7 @@
 
   case 784:
 /* Line 661 of lalr1.cc  */
-#line 6516 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6514 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
@@ -9291,7 +9289,7 @@
 
   case 785:
 /* Line 661 of lalr1.cc  */
-#line 6520 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6518 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
@@ -9299,7 +9297,7 @@
 
   case 786:
 /* Line 661 of lalr1.cc  */
-#line 6528 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6526 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
@@ -9307,7 +9305,7 @@
 
   case 787:
 /* Line 661 of lalr1.cc  */
-#line 6536 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6534 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -9315,7 +9313,7 @@
 
   case 788:
 /* Line 661 of lalr1.cc  */
-#line 6540 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6538 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -9323,7 +9321,7 @@
 
   case 789:
 /* Line 661 of lalr1.cc  */
-#line 6544 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6542 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -9331,7 +9329,7 @@
 
   case 790:
 /* Line 661 of lalr1.cc  */
-#line 6548 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6546 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::from_to, (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr) );
         }
@@ -9339,7 +9337,7 @@
 
   case 791:
 /* Line 661 of lalr1.cc  */
-#line 6556 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6554 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -9351,7 +9349,7 @@
 
   case 792:
 /* Line 661 of lalr1.cc  */
-#line 6564 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6562 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -9363,7 +9361,7 @@
 
   case 793:
 /* Line 661 of lalr1.cc  */
-#line 6576 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6574 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
@@ -9371,7 +9369,7 @@
 
   case 794:
 /* Line 661 of lalr1.cc  */
-#line 6580 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6578 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
@@ -9379,7 +9377,7 @@
 
   case 795:
 /* Line 661 of lalr1.cc  */
-#line 6588 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6586 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
@@ -9387,7 +9385,7 @@
 
   case 796:
 /* Line 661 of lalr1.cc  */
-#line 6594 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6592 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
@@ -9395,7 +9393,7 @@
 
   case 797:
 /* Line 661 of lalr1.cc  */
-#line 6598 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6596 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -9403,7 +9401,7 @@
 
   case 798:
 /* Line 661 of lalr1.cc  */
-#line 6605 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6603 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
         }
@@ -9411,7 +9409,7 @@
 
   case 799:
 /* Line 661 of lalr1.cc  */
-#line 6609 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6607 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
         }
@@ -9419,7 +9417,7 @@
 
   case 800:
 /* Line 661 of lalr1.cc  */
-#line 6616 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6614 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
         }
@@ -9427,7 +9425,7 @@
 
   case 801:
 /* Line 661 of lalr1.cc  */
-#line 6620 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6618 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
         }
@@ -9435,7 +9433,7 @@
 
   case 802:
 /* Line 661 of lalr1.cc  */
-#line 6628 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6626 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -9444,7 +9442,7 @@
 
   case 803:
 /* Line 661 of lalr1.cc  */
-#line 6638 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6636 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(3) - (1)].expr), (yylocation_stack_[(3) - (1)]));
 
@@ -9460,7 +9458,7 @@
 
   case 804:
 /* Line 661 of lalr1.cc  */
-#line 6652 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6650 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
           jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)));
@@ -9470,7 +9468,7 @@
 
   case 805:
 /* Line 661 of lalr1.cc  */
-#line 6658 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6656 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -9481,7 +9479,7 @@
 
   case 806:
 /* Line 661 of lalr1.cc  */
-#line 6667 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6665 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           ERROR_IF_QNAME_NOT_NCNAME((yysemantic_stack_[(5) - (3)].expr), (yylocation_stack_[(5) - (3)]));
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
@@ -9494,7 +9492,7 @@
 
   case 807:
 /* Line 661 of lalr1.cc  */
-#line 6680 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6678 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(5) - (3)].expr),
@@ -9504,7 +9502,7 @@
 
   case 808:
 /* Line 661 of lalr1.cc  */
-#line 6686 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6684 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -9518,7 +9516,7 @@
 
   case 809:
 /* Line 661 of lalr1.cc  */
-#line 6696 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6694 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (5)].expr), (yysemantic_stack_[(8) - (8)].expr));
         }
@@ -9526,7 +9524,7 @@
 
   case 810:
 /* Line 661 of lalr1.cc  */
-#line 6703 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6701 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
         }
@@ -9534,7 +9532,7 @@
 
   case 811:
 /* Line 661 of lalr1.cc  */
-#line 6710 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6708 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<exprnode> lTargetExpr;
           rchandle<exprnode> lSelectorExpr;
@@ -9553,7 +9551,7 @@
 
   case 812:
 /* Line 661 of lalr1.cc  */
-#line 6728 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6726 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<exprnode> lTargetExpr;
           rchandle<exprnode> lSelectorExpr;
@@ -9579,7 +9577,7 @@
 
   case 813:
 /* Line 661 of lalr1.cc  */
-#line 6753 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6751 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<exprnode> lTargetExpr;
           rchandle<exprnode> lSelectorExpr;
@@ -9600,7 +9598,7 @@
 
   case 814:
 /* Line 661 of lalr1.cc  */
-#line 6773 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6771 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -9608,7 +9606,7 @@
 
   case 815:
 /* Line 661 of lalr1.cc  */
-#line 6777 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6775 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -9616,7 +9614,7 @@
 
   case 816:
 /* Line 661 of lalr1.cc  */
-#line 6781 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6779 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -9624,1375 +9622,1375 @@
 
   case 819:
 /* Line 661 of lalr1.cc  */
-#line 6799 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6797 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
   case 820:
 /* Line 661 of lalr1.cc  */
-#line 6800 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6798 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
     break;
 
   case 821:
 /* Line 661 of lalr1.cc  */
-#line 6801 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6799 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
     break;
 
   case 822:
 /* Line 661 of lalr1.cc  */
-#line 6802 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6800 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
     break;
 
   case 823:
 /* Line 661 of lalr1.cc  */
-#line 6803 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6801 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
     break;
 
   case 824:
 /* Line 661 of lalr1.cc  */
-#line 6804 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6802 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
     break;
 
   case 825:
 /* Line 661 of lalr1.cc  */
-#line 6805 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6803 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("item"))); }
     break;
 
   case 826:
 /* Line 661 of lalr1.cc  */
-#line 6806 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6804 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
   case 827:
 /* Line 661 of lalr1.cc  */
-#line 6807 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6805 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
   case 828:
 /* Line 661 of lalr1.cc  */
-#line 6808 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6806 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
     break;
 
   case 829:
 /* Line 661 of lalr1.cc  */
-#line 6809 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6807 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
     break;
 
   case 830:
 /* Line 661 of lalr1.cc  */
-#line 6810 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6808 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
     break;
 
   case 831:
 /* Line 661 of lalr1.cc  */
-#line 6811 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6809 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
   case 832:
 /* Line 661 of lalr1.cc  */
-#line 6812 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6810 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
   case 833:
 /* Line 661 of lalr1.cc  */
-#line 6813 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6811 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
   case 834:
 /* Line 661 of lalr1.cc  */
-#line 6814 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6812 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
     break;
 
   case 835:
 /* Line 661 of lalr1.cc  */
-#line 6815 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6813 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
   case 836:
 /* Line 661 of lalr1.cc  */
-#line 6816 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6814 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("json"))); }
     break;
 
   case 837:
 /* Line 661 of lalr1.cc  */
-#line 6817 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6815 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("array"))); }
     break;
 
   case 838:
 /* Line 661 of lalr1.cc  */
-#line 6818 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6816 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("object"))); }
     break;
 
   case 839:
 /* Line 661 of lalr1.cc  */
-#line 6819 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6817 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("json-item"))); }
     break;
 
   case 840:
 /* Line 661 of lalr1.cc  */
-#line 6820 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6818 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("structured-item"))); }
     break;
 
   case 842:
 /* Line 661 of lalr1.cc  */
-#line 6825 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6823 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
   case 843:
 /* Line 661 of lalr1.cc  */
-#line 6826 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6824 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
   case 844:
 /* Line 661 of lalr1.cc  */
-#line 6827 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6825 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
   case 845:
 /* Line 661 of lalr1.cc  */
-#line 6828 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6826 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
     break;
 
   case 846:
 /* Line 661 of lalr1.cc  */
-#line 6829 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6827 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
     break;
 
   case 847:
 /* Line 661 of lalr1.cc  */
-#line 6830 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6828 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
     break;
 
   case 848:
 /* Line 661 of lalr1.cc  */
-#line 6831 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6829 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
   case 849:
 /* Line 661 of lalr1.cc  */
-#line 6832 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6830 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
   case 850:
 /* Line 661 of lalr1.cc  */
-#line 6833 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6831 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
   case 851:
 /* Line 661 of lalr1.cc  */
-#line 6834 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6832 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
   case 852:
 /* Line 661 of lalr1.cc  */
-#line 6835 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6833 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
   case 853:
 /* Line 661 of lalr1.cc  */
-#line 6836 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6834 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
   case 854:
 /* Line 661 of lalr1.cc  */
-#line 6837 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6835 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
   case 855:
 /* Line 661 of lalr1.cc  */
-#line 6838 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6836 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
   case 856:
 /* Line 661 of lalr1.cc  */
-#line 6839 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6837 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
   case 857:
 /* Line 661 of lalr1.cc  */
-#line 6840 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6838 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
   case 858:
 /* Line 661 of lalr1.cc  */
-#line 6841 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6839 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
   case 859:
 /* Line 661 of lalr1.cc  */
-#line 6842 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6840 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
   case 860:
 /* Line 661 of lalr1.cc  */
-#line 6843 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6841 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
   case 861:
 /* Line 661 of lalr1.cc  */
-#line 6844 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6842 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
   case 862:
 /* Line 661 of lalr1.cc  */
-#line 6845 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6843 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
     break;
 
   case 863:
 /* Line 661 of lalr1.cc  */
-#line 6846 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6844 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
     break;
 
   case 864:
 /* Line 661 of lalr1.cc  */
-#line 6847 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6845 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
     break;
 
   case 865:
 /* Line 661 of lalr1.cc  */
-#line 6848 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6846 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
     break;
 
   case 866:
 /* Line 661 of lalr1.cc  */
-#line 6849 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6847 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
     break;
 
   case 867:
 /* Line 661 of lalr1.cc  */
-#line 6850 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6848 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
     break;
 
   case 868:
 /* Line 661 of lalr1.cc  */
-#line 6851 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6849 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
     break;
 
   case 869:
 /* Line 661 of lalr1.cc  */
-#line 6852 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6850 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
     break;
 
   case 870:
 /* Line 661 of lalr1.cc  */
-#line 6853 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6851 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
     break;
 
   case 871:
 /* Line 661 of lalr1.cc  */
-#line 6854 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6852 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
     break;
 
   case 872:
 /* Line 661 of lalr1.cc  */
-#line 6855 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6853 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
     break;
 
   case 873:
 /* Line 661 of lalr1.cc  */
-#line 6856 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6854 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
     break;
 
   case 874:
 /* Line 661 of lalr1.cc  */
-#line 6857 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6855 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
     break;
 
   case 875:
 /* Line 661 of lalr1.cc  */
-#line 6858 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6856 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
     break;
 
   case 876:
 /* Line 661 of lalr1.cc  */
-#line 6859 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6857 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
     break;
 
   case 877:
 /* Line 661 of lalr1.cc  */
-#line 6860 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6858 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
     break;
 
   case 878:
 /* Line 661 of lalr1.cc  */
-#line 6861 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6859 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
     break;
 
   case 879:
 /* Line 661 of lalr1.cc  */
-#line 6862 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6860 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
     break;
 
   case 880:
 /* Line 661 of lalr1.cc  */
-#line 6863 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6861 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
     break;
 
   case 881:
 /* Line 661 of lalr1.cc  */
-#line 6864 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6862 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
     break;
 
   case 882:
 /* Line 661 of lalr1.cc  */
-#line 6865 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6863 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
     break;
 
   case 883:
 /* Line 661 of lalr1.cc  */
-#line 6866 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6864 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
     break;
 
   case 884:
 /* Line 661 of lalr1.cc  */
-#line 6867 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6865 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
     break;
 
   case 885:
 /* Line 661 of lalr1.cc  */
-#line 6868 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6866 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
     break;
 
   case 886:
 /* Line 661 of lalr1.cc  */
-#line 6869 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6867 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
     break;
 
   case 887:
 /* Line 661 of lalr1.cc  */
-#line 6870 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6868 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
     break;
 
   case 888:
 /* Line 661 of lalr1.cc  */
-#line 6871 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6869 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
     break;
 
   case 889:
 /* Line 661 of lalr1.cc  */
-#line 6872 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6870 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
     break;
 
   case 890:
 /* Line 661 of lalr1.cc  */
-#line 6873 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6871 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
     break;
 
   case 891:
 /* Line 661 of lalr1.cc  */
-#line 6874 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6872 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
     break;
 
   case 892:
 /* Line 661 of lalr1.cc  */
-#line 6875 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6873 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
     break;
 
   case 893:
 /* Line 661 of lalr1.cc  */
-#line 6876 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6874 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
     break;
 
   case 894:
 /* Line 661 of lalr1.cc  */
-#line 6877 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6875 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
     break;
 
   case 895:
 /* Line 661 of lalr1.cc  */
-#line 6878 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6876 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
     break;
 
   case 896:
 /* Line 661 of lalr1.cc  */
-#line 6879 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6877 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
     break;
 
   case 897:
 /* Line 661 of lalr1.cc  */
-#line 6880 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6878 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
     break;
 
   case 898:
 /* Line 661 of lalr1.cc  */
-#line 6881 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6879 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
     break;
 
   case 899:
 /* Line 661 of lalr1.cc  */
-#line 6882 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6880 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
     break;
 
   case 900:
 /* Line 661 of lalr1.cc  */
-#line 6883 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6881 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
     break;
 
   case 901:
 /* Line 661 of lalr1.cc  */
-#line 6884 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6882 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
     break;
 
   case 902:
 /* Line 661 of lalr1.cc  */
-#line 6885 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6883 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
     break;
 
   case 903:
 /* Line 661 of lalr1.cc  */
-#line 6886 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6884 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
     break;
 
   case 904:
 /* Line 661 of lalr1.cc  */
-#line 6887 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6885 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
     break;
 
   case 905:
 /* Line 661 of lalr1.cc  */
-#line 6888 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6886 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
     break;
 
   case 906:
 /* Line 661 of lalr1.cc  */
-#line 6889 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6887 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
     break;
 
   case 907:
 /* Line 661 of lalr1.cc  */
-#line 6890 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6888 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
     break;
 
   case 908:
 /* Line 661 of lalr1.cc  */
-#line 6891 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6889 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
     break;
 
   case 909:
 /* Line 661 of lalr1.cc  */
-#line 6892 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6890 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
     break;
 
   case 910:
 /* Line 661 of lalr1.cc  */
-#line 6893 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6891 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
     break;
 
   case 911:
 /* Line 661 of lalr1.cc  */
-#line 6894 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6892 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
     break;
 
   case 912:
 /* Line 661 of lalr1.cc  */
-#line 6895 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6893 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
     break;
 
   case 913:
 /* Line 661 of lalr1.cc  */
-#line 6896 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6894 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
     break;
 
   case 914:
 /* Line 661 of lalr1.cc  */
-#line 6897 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6895 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
     break;
 
   case 915:
 /* Line 661 of lalr1.cc  */
-#line 6898 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6896 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
     break;
 
   case 916:
 /* Line 661 of lalr1.cc  */
-#line 6899 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6897 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
     break;
 
   case 917:
 /* Line 661 of lalr1.cc  */
-#line 6900 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6898 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
     break;
 
   case 918:
 /* Line 661 of lalr1.cc  */
-#line 6901 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6899 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
     break;
 
   case 919:
 /* Line 661 of lalr1.cc  */
-#line 6902 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6900 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
     break;
 
   case 920:
 /* Line 661 of lalr1.cc  */
-#line 6903 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6901 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
     break;
 
   case 921:
 /* Line 661 of lalr1.cc  */
-#line 6904 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6902 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
     break;
 
   case 922:
 /* Line 661 of lalr1.cc  */
-#line 6905 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6903 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
     break;
 
   case 923:
 /* Line 661 of lalr1.cc  */
-#line 6906 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6904 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
     break;
 
   case 924:
 /* Line 661 of lalr1.cc  */
-#line 6907 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6905 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
     break;
 
   case 925:
 /* Line 661 of lalr1.cc  */
-#line 6908 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6906 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
     break;
 
   case 926:
 /* Line 661 of lalr1.cc  */
-#line 6909 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6907 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
     break;
 
   case 927:
 /* Line 661 of lalr1.cc  */
-#line 6910 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6908 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
     break;
 
   case 928:
 /* Line 661 of lalr1.cc  */
-#line 6911 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6909 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
     break;
 
   case 929:
 /* Line 661 of lalr1.cc  */
-#line 6912 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6910 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
     break;
 
   case 930:
 /* Line 661 of lalr1.cc  */
-#line 6913 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6911 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
     break;
 
   case 931:
 /* Line 661 of lalr1.cc  */
-#line 6914 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6912 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
     break;
 
   case 932:
 /* Line 661 of lalr1.cc  */
-#line 6915 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6913 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
     break;
 
   case 933:
 /* Line 661 of lalr1.cc  */
-#line 6916 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6914 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
     break;
 
   case 934:
 /* Line 661 of lalr1.cc  */
-#line 6917 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6915 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
     break;
 
   case 935:
 /* Line 661 of lalr1.cc  */
-#line 6918 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6916 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
     break;
 
   case 936:
 /* Line 661 of lalr1.cc  */
-#line 6919 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6917 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
     break;
 
   case 937:
 /* Line 661 of lalr1.cc  */
-#line 6920 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6918 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
     break;
 
   case 938:
 /* Line 661 of lalr1.cc  */
-#line 6921 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6919 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
     break;
 
   case 939:
 /* Line 661 of lalr1.cc  */
-#line 6922 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6920 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
     break;
 
   case 940:
 /* Line 661 of lalr1.cc  */
-#line 6923 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6921 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
     break;
 
   case 941:
 /* Line 661 of lalr1.cc  */
-#line 6924 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6922 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
     break;
 
   case 942:
 /* Line 661 of lalr1.cc  */
-#line 6925 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6923 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
     break;
 
   case 943:
 /* Line 661 of lalr1.cc  */
-#line 6926 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6924 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
     break;
 
   case 944:
 /* Line 661 of lalr1.cc  */
-#line 6927 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6925 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
     break;
 
   case 945:
 /* Line 661 of lalr1.cc  */
-#line 6928 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6926 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
     break;
 
   case 946:
 /* Line 661 of lalr1.cc  */
-#line 6929 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6927 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
     break;
 
   case 947:
 /* Line 661 of lalr1.cc  */
-#line 6930 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6928 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
     break;
 
   case 948:
 /* Line 661 of lalr1.cc  */
-#line 6931 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6929 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
     break;
 
   case 949:
 /* Line 661 of lalr1.cc  */
-#line 6932 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6930 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
     break;
 
   case 950:
 /* Line 661 of lalr1.cc  */
-#line 6933 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6931 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
     break;
 
   case 951:
 /* Line 661 of lalr1.cc  */
-#line 6934 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6932 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
     break;
 
   case 952:
 /* Line 661 of lalr1.cc  */
-#line 6935 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6933 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
     break;
 
   case 953:
 /* Line 661 of lalr1.cc  */
-#line 6936 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6934 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
     break;
 
   case 954:
 /* Line 661 of lalr1.cc  */
-#line 6937 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6935 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
     break;
 
   case 955:
 /* Line 661 of lalr1.cc  */
-#line 6938 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6936 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
     break;
 
   case 956:
 /* Line 661 of lalr1.cc  */
-#line 6939 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6937 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
     break;
 
   case 957:
 /* Line 661 of lalr1.cc  */
-#line 6940 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6938 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
     break;
 
   case 958:
 /* Line 661 of lalr1.cc  */
-#line 6941 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6939 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
     break;
 
   case 959:
 /* Line 661 of lalr1.cc  */
-#line 6942 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6940 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
     break;
 
   case 960:
 /* Line 661 of lalr1.cc  */
-#line 6943 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6941 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
     break;
 
   case 961:
 /* Line 661 of lalr1.cc  */
-#line 6944 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6942 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
     break;
 
   case 962:
 /* Line 661 of lalr1.cc  */
-#line 6945 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6943 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
     break;
 
   case 963:
 /* Line 661 of lalr1.cc  */
-#line 6946 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6944 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
     break;
 
   case 964:
 /* Line 661 of lalr1.cc  */
-#line 6947 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6945 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
     break;
 
   case 965:
 /* Line 661 of lalr1.cc  */
-#line 6948 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6946 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
     break;
 
   case 966:
 /* Line 661 of lalr1.cc  */
-#line 6949 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6947 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
     break;
 
   case 967:
 /* Line 661 of lalr1.cc  */
-#line 6950 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6948 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
     break;
 
   case 968:
 /* Line 661 of lalr1.cc  */
-#line 6951 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6949 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
     break;
 
   case 969:
 /* Line 661 of lalr1.cc  */
-#line 6952 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6950 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
     break;
 
   case 970:
 /* Line 661 of lalr1.cc  */
-#line 6953 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6951 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
     break;
 
   case 971:
 /* Line 661 of lalr1.cc  */
-#line 6954 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6952 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append"))); }
     break;
 
   case 972:
 /* Line 661 of lalr1.cc  */
-#line 6955 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6953 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insert"))); }
     break;
 
   case 973:
 /* Line 661 of lalr1.cc  */
-#line 6956 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6954 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("replace"))); }
     break;
 
   case 974:
 /* Line 661 of lalr1.cc  */
-#line 6957 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6955 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("rename"))); }
     break;
 
   case 975:
 /* Line 661 of lalr1.cc  */
-#line 6958 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6956 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("delete"))); }
     break;
 
   case 976:
 /* Line 661 of lalr1.cc  */
-#line 6959 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6957 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
     break;
 
   case 977:
 /* Line 661 of lalr1.cc  */
-#line 6960 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6958 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
     break;
 
   case 978:
 /* Line 661 of lalr1.cc  */
-#line 6961 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6959 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
     break;
 
   case 979:
 /* Line 661 of lalr1.cc  */
-#line 6962 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6960 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
     break;
 
   case 980:
 /* Line 661 of lalr1.cc  */
-#line 6963 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6961 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
     break;
 
   case 981:
 /* Line 661 of lalr1.cc  */
-#line 6964 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6962 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
     break;
 
   case 982:
 /* Line 661 of lalr1.cc  */
-#line 6965 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6963 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
     break;
 
   case 983:
 /* Line 661 of lalr1.cc  */
-#line 6966 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6964 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
     break;
 
   case 984:
 /* Line 661 of lalr1.cc  */
-#line 6967 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6965 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
     break;
 
   case 985:
 /* Line 661 of lalr1.cc  */
-#line 6968 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6966 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
     break;
 
   case 986:
 /* Line 661 of lalr1.cc  */
-#line 6969 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6967 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
     break;
 
   case 987:
 /* Line 661 of lalr1.cc  */
-#line 6970 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6968 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
     break;
 
   case 988:
 /* Line 661 of lalr1.cc  */
-#line 6971 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6969 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
     break;
 
   case 989:
 /* Line 661 of lalr1.cc  */
-#line 6972 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6970 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
     break;
 
   case 990:
 /* Line 661 of lalr1.cc  */
-#line 6973 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6971 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
     break;
 
   case 991:
 /* Line 661 of lalr1.cc  */
-#line 6974 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6972 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
     break;
 
   case 992:
 /* Line 661 of lalr1.cc  */
-#line 6975 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6973 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
     break;
 
   case 993:
 /* Line 661 of lalr1.cc  */
-#line 6976 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6974 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
     break;
 
   case 994:
 /* Line 661 of lalr1.cc  */
-#line 6977 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6975 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
     break;
 
   case 995:
 /* Line 661 of lalr1.cc  */
-#line 6978 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6976 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
     break;
 
   case 996:
 /* Line 661 of lalr1.cc  */
-#line 6979 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6977 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
     break;
 
   case 997:
 /* Line 661 of lalr1.cc  */
-#line 6980 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6978 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
     break;
 
   case 998:
 /* Line 661 of lalr1.cc  */
-#line 6981 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6979 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
     break;
 
   case 999:
 /* Line 661 of lalr1.cc  */
-#line 6982 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6980 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
     break;
 
   case 1000:
 /* Line 661 of lalr1.cc  */
-#line 6983 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6981 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
     break;
 
   case 1001:
 /* Line 661 of lalr1.cc  */
-#line 6984 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6982 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
     break;
 
   case 1002:
 /* Line 661 of lalr1.cc  */
-#line 6985 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6983 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
     break;
 
   case 1003:
 /* Line 661 of lalr1.cc  */
-#line 6986 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6984 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
     break;
 
   case 1004:
 /* Line 661 of lalr1.cc  */
-#line 6987 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6985 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
     break;
 
   case 1005:
 /* Line 661 of lalr1.cc  */
-#line 6988 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6986 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
     break;
 
   case 1006:
 /* Line 661 of lalr1.cc  */
-#line 6989 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6987 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
     break;
 
   case 1007:
 /* Line 661 of lalr1.cc  */
-#line 6990 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6988 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
     break;
 
   case 1008:
 /* Line 661 of lalr1.cc  */
-#line 6991 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6989 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
     break;
 
   case 1009:
 /* Line 661 of lalr1.cc  */
-#line 6992 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6990 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
     break;
 
   case 1010:
 /* Line 661 of lalr1.cc  */
-#line 6993 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6991 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
     break;
 
   case 1011:
 /* Line 661 of lalr1.cc  */
-#line 6994 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6992 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
     break;
 
   case 1012:
 /* Line 661 of lalr1.cc  */
-#line 6995 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6993 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
     break;
 
   case 1013:
 /* Line 661 of lalr1.cc  */
-#line 6996 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6994 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
     break;
 
   case 1014:
 /* Line 661 of lalr1.cc  */
-#line 6997 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6995 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
     break;
 
   case 1015:
 /* Line 661 of lalr1.cc  */
-#line 6998 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6996 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
     break;
 
   case 1016:
 /* Line 661 of lalr1.cc  */
-#line 6999 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6997 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
     break;
 
   case 1017:
 /* Line 661 of lalr1.cc  */
-#line 7000 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6998 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
     break;
 
   case 1018:
 /* Line 661 of lalr1.cc  */
-#line 7001 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 6999 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
     break;
 
   case 1019:
 /* Line 661 of lalr1.cc  */
-#line 7002 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7000 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
     break;
 
   case 1020:
 /* Line 661 of lalr1.cc  */
-#line 7003 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7001 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
     break;
 
   case 1021:
 /* Line 661 of lalr1.cc  */
-#line 7004 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7002 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
     break;
 
   case 1022:
 /* Line 661 of lalr1.cc  */
-#line 7005 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7003 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
     break;
 
   case 1023:
 /* Line 661 of lalr1.cc  */
-#line 7006 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7004 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
     break;
 
   case 1024:
 /* Line 661 of lalr1.cc  */
-#line 7007 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7005 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
     break;
 
   case 1025:
 /* Line 661 of lalr1.cc  */
-#line 7008 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7006 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
     break;
 
   case 1026:
 /* Line 661 of lalr1.cc  */
-#line 7009 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7007 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
     break;
 
   case 1027:
 /* Line 661 of lalr1.cc  */
-#line 7010 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7008 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
     break;
 
   case 1028:
 /* Line 661 of lalr1.cc  */
-#line 7011 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7009 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
     break;
 
   case 1029:
 /* Line 661 of lalr1.cc  */
-#line 7012 "/Users/pjl/src/flwor/zorba/repo/no_commas/zorba/build/src/compiler/parser/jsoniq_parser.y"
+#line 7010 "/Users/pjl/src/flwor/zorba/repo/pjl-misc/zorba/build/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(

Follow ups

[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: noreply, 2014-03-14
[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Zorba Build Bot, 2014-03-14
[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Zorba Build Bot, 2014-03-14
Re: [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Matthias Brantner, 2014-03-14
Re: [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Paul J. Lucas, 2014-03-14
[Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Paul J. Lucas, 2014-03-14
Re: [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
From: Paul J. Lucas, 2014-03-14