zorba-coders team mailing list archive

[Nicolae Brinza <nbrinza@xxxxxxxxx>]

Nicolae Brinza has proposed merging lp:~zorba-coders/zorba/new-jsoniq into lp:zorba.

Commit message:
The jsoniq parser now accepts "&" as a valid string literal.

Requested reviews:
  Nicolae Brinza (nbrinza)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/157559

The jsoniq parser now accepts "&" as a valid string literal.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/157559
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-03-27 17:32:54 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-04-07 19:24:25 +0000
@@ -36,7 +36,7 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
-#line 88 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 88 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
 
 #include "common/common.h"
@@ -65,7 +65,7 @@
 
 
 /* Line 293 of lalr1.cc  */
-#line 69 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 69 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 #include "jsoniq_parser.hpp"
@@ -73,7 +73,7 @@
 /* User implementation prologue.  */
 
 /* Line 299 of lalr1.cc  */
-#line 917 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 917 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
 // HACK to trigger rchandle release: rchandles are freed when refcount == 0
 // (not <= 0); but Bison never increments the refcount, so we do it manually...
@@ -85,7 +85,7 @@
 }
 
 /* Line 299 of lalr1.cc  */
-#line 1053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1053 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
 #include "compiler/parser/jsoniq_scanner.h"
 
@@ -95,7 +95,7 @@
 
 
 /* Line 299 of lalr1.cc  */
-#line 99 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 99 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -181,7 +181,7 @@
 namespace zorba {
 
 /* Line 382 of lalr1.cc  */
-#line 185 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 185 "/home/colea/xquery/new-jsoniq/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
@@ -282,2495 +282,2495 @@
         case 112: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 915 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 915 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 290 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 290 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 127: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 914 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 299 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 299 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 152: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 913 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 913 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 308 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 308 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 317 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 317 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 347: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 326 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 326 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 348: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 335 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 335 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 349: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 344 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 344 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 350: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 353 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 353 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 351: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 362 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 362 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 352: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 371 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 371 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 353: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 380 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 380 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 354: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 389 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 389 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 355: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 398 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 398 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 356: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 407 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 407 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 357: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 416 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 416 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 358: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 425 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 425 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 359: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 434 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 434 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 360: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 443 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 443 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 361: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 452 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 452 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 362: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 461 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 461 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 363: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 470 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 470 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 364: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 479 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 479 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 365: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 488 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 488 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 366: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 497 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 497 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 367: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 506 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 506 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 368: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 515 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 515 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 369: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 524 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 524 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 370: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 533 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 533 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 371: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 542 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 542 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 551 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 551 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 374: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 560 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 560 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 375: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 569 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 569 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 376: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 578 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 578 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 377: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 587 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 587 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 378: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 596 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 596 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 379: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 605 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 605 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 380: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 614 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 614 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 623 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 623 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 382: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 632 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 632 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 383: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 641 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 641 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 384: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 650 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 650 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 385: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 659 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 659 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 386: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 668 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 668 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 387: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 677 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 677 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 388: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 686 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 686 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 695 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 695 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 390: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 704 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 704 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 391: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 713 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 713 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 393: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 722 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 722 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 394: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 731 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 731 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 395: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 740 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 740 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 396: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 749 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 749 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 397: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 758 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 758 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 398: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 767 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 767 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 399: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 776 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 776 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 400: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 785 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 401: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 794 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 402: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 803 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 803 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 403: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 812 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 812 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 404: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 821 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 821 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 405: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 830 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 830 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 406: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 839 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 839 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 409: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 848 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 848 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 410: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 857 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 857 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 411: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 866 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 866 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 412: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 875 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 875 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 413: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 884 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 884 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 414: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 893 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 893 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 415: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 902 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 902 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 416: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 911 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 911 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 417: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 920 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 418: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 929 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 929 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 419: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 938 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 421: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 947 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 422: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 956 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 956 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 423: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 965 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 965 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 424: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 974 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 974 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 425: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 983 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 983 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 428: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 992 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 992 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 429: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1001 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1001 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 430: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1010 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1010 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 431: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1019 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1019 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 433: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1028 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1028 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 434: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1037 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1037 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 436: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1046 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1046 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 437: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1055 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1055 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 438: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1064 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1064 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 439: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1073 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1073 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 440: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1082 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1082 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 441: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1091 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1091 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 442: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1100 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1100 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 443: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1109 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1109 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 444: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1118 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1118 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 445: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1127 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1127 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 446: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1136 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1136 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 447: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1145 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1145 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 448: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1154 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1154 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 449: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1163 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1163 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 450: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1172 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1172 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 451: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1181 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1181 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 452: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1190 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1190 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 453: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1199 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1199 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 454: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1208 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1208 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 455: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1217 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1217 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 456: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1226 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1226 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 457: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1235 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1235 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 458: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1244 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1244 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 459: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1253 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1253 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 460: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1262 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1262 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 461: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1271 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1271 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 462: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1280 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1280 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 463: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1289 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1289 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 464: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1298 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1298 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 465: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1307 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1307 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 466: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1316 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1316 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 469: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1325 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1325 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 470: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1334 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1334 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 471: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1343 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1343 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 472: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1352 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1352 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 475: /* "SequenceTypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1361 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1361 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 476: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1370 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1370 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 477: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1379 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1379 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 478: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1388 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1388 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 479: /* "NotExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1397 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1397 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 480: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1406 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1406 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 481: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1415 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1415 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 482: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1424 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1424 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 483: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1433 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1433 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 484: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1442 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1442 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 485: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1451 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1451 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 486: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1460 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1460 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 487: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1469 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1469 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 488: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1478 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1478 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 489: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1487 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1487 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 490: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1496 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1496 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 491: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1505 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1505 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 492: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1514 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1514 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 493: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1523 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1523 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 494: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1532 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1532 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 495: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1541 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1541 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 496: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1550 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1550 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 497: /* "SimpleMapExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1559 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1559 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 498: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1568 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1568 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 499: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1577 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1577 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 500: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1586 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1586 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 501: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1595 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1595 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 502: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1604 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1604 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 503: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1613 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1613 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 504: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1622 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1622 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 505: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1631 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1631 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 506: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1640 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1640 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 507: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1649 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1649 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 508: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1658 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1658 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 509: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1667 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1667 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 510: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1676 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1676 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 511: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1685 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1685 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 512: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1694 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1694 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 513: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1703 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1703 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 515: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1712 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1712 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 516: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1721 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1721 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 517: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1730 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1730 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 518: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1739 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 519: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1748 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1748 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 520: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1757 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1757 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 521: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1766 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1766 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 525: /* "Constructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1775 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 526: /* "DirectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1784 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 527: /* "DirElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1793 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 528: /* "DirElemContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1802 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 529: /* "DirAttributeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1811 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1811 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 530: /* "DirAttr" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1820 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1820 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 532: /* "DirAttributeValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1829 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1829 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 533: /* "opt_QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1838 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1838 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 534: /* "QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1847 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1847 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 535: /* "opt_AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1856 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1856 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 536: /* "AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1865 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1865 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 537: /* "QuoteAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1874 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1874 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 538: /* "AposAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1883 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1883 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 539: /* "DirElemContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1892 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1892 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 540: /* "CommonContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1901 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1901 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 541: /* "DirCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1910 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1910 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 542: /* "DirPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1919 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1919 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 543: /* "CDataSection" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1928 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1928 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 544: /* "ComputedConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1937 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1937 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 545: /* "CompDocConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1946 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1946 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 546: /* "CompElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1955 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1955 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 547: /* "CompAttrConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1964 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1964 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 548: /* "CompTextConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1973 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1973 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 549: /* "CompCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1982 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1982 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 550: /* "CompPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1991 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1991 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 551: /* "CompNamespaceConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2000 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 552: /* "TypeDeclaration" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2009 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2009 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 553: /* "SequenceType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2018 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2018 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 554: /* "OccurrenceIndicator" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2027 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2027 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 555: /* "ItemType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2036 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2036 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 556: /* "TypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2045 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2045 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 557: /* "GeneralizedAtomicType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2054 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2054 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 558: /* "SimpleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2063 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2063 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 559: /* "KindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2072 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2072 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 560: /* "AnyKindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2081 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2081 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 561: /* "DocumentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2090 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2090 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 562: /* "NamespaceTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2099 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2099 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 563: /* "TextTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2108 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2108 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 564: /* "CommentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2117 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2117 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 565: /* "PITest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2126 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2126 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 566: /* "AttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2135 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2135 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 567: /* "SchemaAttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2144 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2144 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 568: /* "ElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2153 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2153 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 569: /* "SchemaElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2162 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2162 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 570: /* "TypeName" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2171 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2171 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 571: /* "TypeName_WITH_HOOK" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2180 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2180 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 572: /* "StringLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2189 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2189 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 574: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2198 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2198 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 575: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2207 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2207 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 578: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2216 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2216 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 579: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2225 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2225 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 580: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2234 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2234 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 581: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2243 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2243 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 582: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2252 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2252 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 583: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2261 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2261 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 584: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2270 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2270 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 585: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2279 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2279 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 586: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2288 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2288 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 587: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2297 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2297 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 588: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2306 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2306 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 589: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2315 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2315 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2324 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2324 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 593: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2333 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2333 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 594: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2342 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2342 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 595: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2351 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2351 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 596: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2360 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2360 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 597: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2369 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2369 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 598: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2378 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2378 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 600: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2387 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2387 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 601: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2396 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2396 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 602: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2405 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2405 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 603: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2414 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 605: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2423 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2423 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 606: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2432 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2432 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 608: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2441 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2441 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 611: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2450 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2450 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 612: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2459 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2459 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 613: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2468 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2468 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 614: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2477 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2477 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 615: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2486 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2486 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 616: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2495 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2495 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 617: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2504 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2504 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 618: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2513 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2513 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 619: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2522 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2522 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 620: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2531 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2531 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 621: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2540 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2540 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 622: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2549 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2549 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 626: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2558 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2558 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 629: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2567 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2567 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 630: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2576 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2576 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 634: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2585 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2585 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 635: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2594 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2594 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 636: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2603 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2603 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 637: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2612 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2612 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 638: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2621 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2621 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 639: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2630 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2630 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 640: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2639 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2639 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 641: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2648 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2648 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 642: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2657 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2657 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 643: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2666 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2666 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 644: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2675 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2675 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 645: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2684 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2684 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 646: /* "JSONObjectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2693 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2693 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 647: /* "JSONPairList" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2702 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2702 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 648: /* "JSONInsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2711 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2711 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 649: /* "JSONAppendExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2720 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2720 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 650: /* "JSONDeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2729 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2729 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 651: /* "JSONRenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2738 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2738 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 652: /* "JSONReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2747 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2747 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 659: /* "QNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2756 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2756 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 660: /* "FUNCTION_NAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2765 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 661: /* "EQNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2774 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
 
 	default:
@@ -2861,13 +2861,13 @@
     /* User initialization code.  */
     
 /* Line 565 of lalr1.cc  */
-#line 133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 133 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 
 /* Line 565 of lalr1.cc  */
-#line 2871 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2871 "/home/colea/xquery/new-jsoniq/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
@@ -2986,7 +2986,7 @@
 	  case 3:
 
 /* Line 690 of lalr1.cc  */
-#line 1071 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1071 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2995,7 +2995,7 @@
   case 4:
 
 /* Line 690 of lalr1.cc  */
-#line 1075 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1075 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -3004,7 +3004,7 @@
   case 5:
 
 /* Line 690 of lalr1.cc  */
-#line 1079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1079 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -3013,7 +3013,7 @@
   case 6:
 
 /* Line 690 of lalr1.cc  */
-#line 1087 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1087 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL;
       }
@@ -3022,7 +3022,7 @@
   case 7:
 
 /* Line 690 of lalr1.cc  */
-#line 1093 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1093 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3031,7 +3031,7 @@
   case 8:
 
 /* Line 690 of lalr1.cc  */
-#line 1097 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1097 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3040,7 +3040,7 @@
   case 9:
 
 /* Line 690 of lalr1.cc  */
-#line 1106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1106 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3050,7 +3050,7 @@
   case 10:
 
 /* Line 690 of lalr1.cc  */
-#line 1112 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1112 "/home/colea/xquery/new-jsoniq/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)) );
@@ -3062,7 +3062,7 @@
   case 11:
 
 /* Line 690 of lalr1.cc  */
-#line 1120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3072,7 +3072,7 @@
   case 12:
 
 /* Line 690 of lalr1.cc  */
-#line 1126 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1126 "/home/colea/xquery/new-jsoniq/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)) );
@@ -3084,7 +3084,7 @@
   case 13:
 
 /* Line 690 of lalr1.cc  */
-#line 1137 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1137 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
     }
@@ -3093,7 +3093,7 @@
   case 14:
 
 /* Line 690 of lalr1.cc  */
-#line 1142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
     }
@@ -3102,7 +3102,7 @@
   case 15:
 
 /* Line 690 of lalr1.cc  */
-#line 1146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1146 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
     }
@@ -3111,7 +3111,7 @@
   case 16:
 
 /* Line 690 of lalr1.cc  */
-#line 1151 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1151 "/home/colea/xquery/new-jsoniq/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 );
@@ -3121,7 +3121,7 @@
   case 17:
 
 /* Line 690 of lalr1.cc  */
-#line 1160 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1160 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -3132,7 +3132,7 @@
   case 18:
 
 /* Line 690 of lalr1.cc  */
-#line 1167 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1167 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -3143,7 +3143,7 @@
   case 19:
 
 /* Line 690 of lalr1.cc  */
-#line 1174 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1174 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3156,7 +3156,7 @@
   case 20:
 
 /* Line 690 of lalr1.cc  */
-#line 1183 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1183 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
@@ -3165,7 +3165,7 @@
   case 21:
 
 /* Line 690 of lalr1.cc  */
-#line 1190 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1190 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3177,7 +3177,7 @@
   case 22:
 
 /* Line 690 of lalr1.cc  */
-#line 1198 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1198 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3189,7 +3189,7 @@
   case 23:
 
 /* Line 690 of lalr1.cc  */
-#line 1206 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1206 "/home/colea/xquery/new-jsoniq/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); // to prevent the Bison warning
       (yylocation_stack_[(5) - (3)]).step();
@@ -3201,7 +3201,7 @@
   case 24:
 
 /* Line 690 of lalr1.cc  */
-#line 1214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1214 "/home/colea/xquery/new-jsoniq/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); // to prevent the Bison warning
       (yylocation_stack_[(5) - (1)]).step();
@@ -3213,7 +3213,7 @@
   case 25:
 
 /* Line 690 of lalr1.cc  */
-#line 1225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1225 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
@@ -3222,7 +3222,7 @@
   case 26:
 
 /* Line 690 of lalr1.cc  */
-#line 1230 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1230 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -3233,7 +3233,7 @@
   case 27:
 
 /* Line 690 of lalr1.cc  */
-#line 1237 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1237 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -3244,7 +3244,7 @@
   case 28:
 
 /* Line 690 of lalr1.cc  */
-#line 1244 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1244 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3257,7 +3257,7 @@
   case 29:
 
 /* Line 690 of lalr1.cc  */
-#line 1256 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1256 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
 
@@ -3268,7 +3268,7 @@
   case 30:
 
 /* Line 690 of lalr1.cc  */
-#line 1266 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1266 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3279,7 +3279,7 @@
   case 31:
 
 /* Line 690 of lalr1.cc  */
-#line 1273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1273 "/home/colea/xquery/new-jsoniq/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);
@@ -3289,7 +3289,7 @@
   case 32:
 
 /* Line 690 of lalr1.cc  */
-#line 1280 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1280 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       // error
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
@@ -3302,7 +3302,7 @@
   case 46:
 
 /* Line 690 of lalr1.cc  */
-#line 1315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1315 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -3311,7 +3311,7 @@
   case 47:
 
 /* Line 690 of lalr1.cc  */
-#line 1320 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1320 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -3320,7 +3320,7 @@
   case 48:
 
 /* Line 690 of lalr1.cc  */
-#line 1328 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1328 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -3329,7 +3329,7 @@
   case 49:
 
 /* Line 690 of lalr1.cc  */
-#line 1336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1336 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -3338,7 +3338,7 @@
   case 50:
 
 /* Line 690 of lalr1.cc  */
-#line 1344 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1344 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -3347,7 +3347,7 @@
   case 51:
 
 /* Line 690 of lalr1.cc  */
-#line 1349 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1349 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -3356,7 +3356,7 @@
   case 52:
 
 /* Line 690 of lalr1.cc  */
-#line 1357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1357 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -3365,7 +3365,7 @@
   case 53:
 
 /* Line 690 of lalr1.cc  */
-#line 1362 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1362 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -3374,7 +3374,7 @@
   case 54:
 
 /* Line 690 of lalr1.cc  */
-#line 1370 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1370 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -3383,7 +3383,7 @@
   case 55:
 
 /* Line 690 of lalr1.cc  */
-#line 1375 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1375 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -3392,7 +3392,7 @@
   case 56:
 
 /* Line 690 of lalr1.cc  */
-#line 1383 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1383 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
@@ -3401,7 +3401,7 @@
   case 57:
 
 /* Line 690 of lalr1.cc  */
-#line 1388 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1388 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
@@ -3410,7 +3410,7 @@
   case 58:
 
 /* Line 690 of lalr1.cc  */
-#line 1393 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1393 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
@@ -3419,7 +3419,7 @@
   case 59:
 
 /* Line 690 of lalr1.cc  */
-#line 1398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1398 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
@@ -3428,7 +3428,7 @@
   case 62:
 
 /* Line 690 of lalr1.cc  */
-#line 1411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1411 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yyval.node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
@@ -3439,7 +3439,7 @@
   case 63:
 
 /* Line 690 of lalr1.cc  */
-#line 1421 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1421 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
@@ -3448,7 +3448,7 @@
   case 64:
 
 /* Line 690 of lalr1.cc  */
-#line 1426 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1426 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3460,7 +3460,7 @@
   case 65:
 
 /* Line 690 of lalr1.cc  */
-#line 1434 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1434 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3472,7 +3472,7 @@
   case 66:
 
 /* Line 690 of lalr1.cc  */
-#line 1442 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1442 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3484,7 +3484,7 @@
   case 67:
 
 /* Line 690 of lalr1.cc  */
-#line 1453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3495,7 +3495,7 @@
   case 68:
 
 /* Line 690 of lalr1.cc  */
-#line 1460 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1460 "/home/colea/xquery/new-jsoniq/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)) );
@@ -3507,7 +3507,7 @@
   case 69:
 
 /* Line 690 of lalr1.cc  */
-#line 1471 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1471 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -3516,7 +3516,7 @@
   case 70:
 
 /* Line 690 of lalr1.cc  */
-#line 1476 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1476 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -3525,7 +3525,7 @@
   case 71:
 
 /* Line 690 of lalr1.cc  */
-#line 1484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1484 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3536,7 +3536,7 @@
   case 72:
 
 /* Line 690 of lalr1.cc  */
-#line 1491 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1491 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
 
@@ -3547,7 +3547,7 @@
   case 73:
 
 /* Line 690 of lalr1.cc  */
-#line 1498 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1498 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3560,7 +3560,7 @@
   case 74:
 
 /* Line 690 of lalr1.cc  */
-#line 1507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1507 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3574,7 +3574,7 @@
   case 75:
 
 /* Line 690 of lalr1.cc  */
-#line 1520 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1520 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
@@ -3583,7 +3583,7 @@
   case 76:
 
 /* Line 690 of lalr1.cc  */
-#line 1528 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1528 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3594,7 +3594,7 @@
   case 77:
 
 /* Line 690 of lalr1.cc  */
-#line 1535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1535 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3605,7 +3605,7 @@
   case 78:
 
 /* Line 690 of lalr1.cc  */
-#line 1545 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1545 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3616,7 +3616,7 @@
   case 79:
 
 /* Line 690 of lalr1.cc  */
-#line 1552 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1552 "/home/colea/xquery/new-jsoniq/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);
@@ -3626,7 +3626,7 @@
   case 80:
 
 /* Line 690 of lalr1.cc  */
-#line 1559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1559 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3638,7 +3638,7 @@
   case 89:
 
 /* Line 690 of lalr1.cc  */
-#line 1582 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1582 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3648,7 +3648,7 @@
   case 90:
 
 /* Line 690 of lalr1.cc  */
-#line 1588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1588 "/home/colea/xquery/new-jsoniq/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);
@@ -3658,7 +3658,7 @@
   case 91:
 
 /* Line 690 of lalr1.cc  */
-#line 1597 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1597 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3669,7 +3669,7 @@
   case 92:
 
 /* Line 690 of lalr1.cc  */
-#line 1604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1604 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3680,7 +3680,7 @@
   case 93:
 
 /* Line 690 of lalr1.cc  */
-#line 1614 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1614 "/home/colea/xquery/new-jsoniq/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() );
@@ -3691,77 +3691,77 @@
   case 94:
 
 /* Line 690 of lalr1.cc  */
-#line 1623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1623 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 95:
 
 /* Line 690 of lalr1.cc  */
-#line 1624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1624 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 96:
 
 /* Line 690 of lalr1.cc  */
-#line 1625 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1625 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 97:
 
 /* Line 690 of lalr1.cc  */
-#line 1626 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1626 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
   case 98:
 
 /* Line 690 of lalr1.cc  */
-#line 1627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1627 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 99:
 
 /* Line 690 of lalr1.cc  */
-#line 1628 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1628 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 100:
 
 /* Line 690 of lalr1.cc  */
-#line 1629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1629 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 101:
 
 /* Line 690 of lalr1.cc  */
-#line 1630 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1630 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 102:
 
 /* Line 690 of lalr1.cc  */
-#line 1631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1631 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 103:
 
 /* Line 690 of lalr1.cc  */
-#line 1632 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1632 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 104:
 
 /* Line 690 of lalr1.cc  */
-#line 1638 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1638 "/home/colea/xquery/new-jsoniq/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)));
     }
@@ -3770,7 +3770,7 @@
   case 105:
 
 /* Line 690 of lalr1.cc  */
-#line 1646 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1646 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3779,7 +3779,7 @@
   case 106:
 
 /* Line 690 of lalr1.cc  */
-#line 1654 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1654 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3788,7 +3788,7 @@
   case 107:
 
 /* Line 690 of lalr1.cc  */
-#line 1662 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1662 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3799,7 +3799,7 @@
   case 108:
 
 /* Line 690 of lalr1.cc  */
-#line 1669 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1669 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3808,7 +3808,7 @@
   case 109:
 
 /* Line 690 of lalr1.cc  */
-#line 1677 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1677 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3819,7 +3819,7 @@
   case 110:
 
 /* Line 690 of lalr1.cc  */
-#line 1684 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1684 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3828,7 +3828,7 @@
   case 111:
 
 /* Line 690 of lalr1.cc  */
-#line 1689 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1689 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3837,7 +3837,7 @@
   case 112:
 
 /* Line 690 of lalr1.cc  */
-#line 1697 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1697 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3846,7 +3846,7 @@
   case 113:
 
 /* Line 690 of lalr1.cc  */
-#line 1705 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1705 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3864,7 +3864,7 @@
   case 114:
 
 /* Line 690 of lalr1.cc  */
-#line 1719 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1719 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3882,7 +3882,7 @@
   case 115:
 
 /* Line 690 of lalr1.cc  */
-#line 1733 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1733 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3900,7 +3900,7 @@
   case 116:
 
 /* Line 690 of lalr1.cc  */
-#line 1750 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1750 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
@@ -3909,7 +3909,7 @@
   case 117:
 
 /* Line 690 of lalr1.cc  */
-#line 1755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1755 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3921,7 +3921,7 @@
   case 118:
 
 /* Line 690 of lalr1.cc  */
-#line 1763 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1763 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3933,7 +3933,7 @@
   case 119:
 
 /* Line 690 of lalr1.cc  */
-#line 1771 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1771 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3945,7 +3945,7 @@
   case 120:
 
 /* Line 690 of lalr1.cc  */
-#line 1782 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1782 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3954,7 +3954,7 @@
   case 121:
 
 /* Line 690 of lalr1.cc  */
-#line 1787 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1787 "/home/colea/xquery/new-jsoniq/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);
@@ -3964,7 +3964,7 @@
   case 122:
 
 /* Line 690 of lalr1.cc  */
-#line 1796 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1796 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
@@ -3973,7 +3973,7 @@
   case 123:
 
 /* Line 690 of lalr1.cc  */
-#line 1801 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1801 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3984,7 +3984,7 @@
   case 124:
 
 /* Line 690 of lalr1.cc  */
-#line 1808 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1808 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
@@ -3993,7 +3993,7 @@
   case 125:
 
 /* Line 690 of lalr1.cc  */
-#line 1813 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1813 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -4004,7 +4004,7 @@
   case 126:
 
 /* Line 690 of lalr1.cc  */
-#line 1823 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1823 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -4013,7 +4013,7 @@
   case 127:
 
 /* Line 690 of lalr1.cc  */
-#line 1828 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1828 "/home/colea/xquery/new-jsoniq/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);
@@ -4023,7 +4023,7 @@
   case 128:
 
 /* Line 690 of lalr1.cc  */
-#line 1837 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1837 "/home/colea/xquery/new-jsoniq/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);
@@ -4033,7 +4033,7 @@
   case 129:
 
 /* Line 690 of lalr1.cc  */
-#line 1843 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1843 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4047,7 +4047,7 @@
   case 130:
 
 /* Line 690 of lalr1.cc  */
-#line 1856 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1856 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4056,7 +4056,7 @@
   case 131:
 
 /* Line 690 of lalr1.cc  */
-#line 1861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1861 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4065,7 +4065,7 @@
   case 132:
 
 /* Line 690 of lalr1.cc  */
-#line 1869 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1869 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4081,7 +4081,7 @@
   case 133:
 
 /* Line 690 of lalr1.cc  */
-#line 1880 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1880 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4097,7 +4097,7 @@
   case 134:
 
 /* Line 690 of lalr1.cc  */
-#line 1895 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1895 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4113,7 +4113,7 @@
   case 135:
 
 /* Line 690 of lalr1.cc  */
-#line 1907 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1907 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4129,7 +4129,7 @@
   case 136:
 
 /* Line 690 of lalr1.cc  */
-#line 1922 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1922 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -4138,7 +4138,7 @@
   case 137:
 
 /* Line 690 of lalr1.cc  */
-#line 1927 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1927 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -4147,7 +4147,7 @@
   case 138:
 
 /* Line 690 of lalr1.cc  */
-#line 1932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
@@ -4156,7 +4156,7 @@
   case 139:
 
 /* Line 690 of lalr1.cc  */
-#line 1937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1937 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
@@ -4165,7 +4165,7 @@
   case 140:
 
 /* Line 690 of lalr1.cc  */
-#line 1945 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1945 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4176,7 +4176,7 @@
   case 141:
 
 /* Line 690 of lalr1.cc  */
-#line 1952 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1952 "/home/colea/xquery/new-jsoniq/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)) );
@@ -4188,7 +4188,7 @@
   case 142:
 
 /* Line 690 of lalr1.cc  */
-#line 1963 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1963 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
@@ -4197,7 +4197,7 @@
   case 143:
 
 /* Line 690 of lalr1.cc  */
-#line 1968 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1968 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4208,7 +4208,7 @@
   case 144:
 
 /* Line 690 of lalr1.cc  */
-#line 1978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1978 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4222,7 +4222,7 @@
   case 145:
 
 /* Line 690 of lalr1.cc  */
-#line 1987 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1987 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4236,7 +4236,7 @@
   case 146:
 
 /* Line 690 of lalr1.cc  */
-#line 1996 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 1996 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4250,7 +4250,7 @@
   case 147:
 
 /* Line 690 of lalr1.cc  */
-#line 2005 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2005 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4264,7 +4264,7 @@
   case 148:
 
 /* Line 690 of lalr1.cc  */
-#line 2017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2017 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4273,7 +4273,7 @@
   case 149:
 
 /* Line 690 of lalr1.cc  */
-#line 2021 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2021 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4284,7 +4284,7 @@
   case 150:
 
 /* Line 690 of lalr1.cc  */
-#line 2027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2027 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4293,7 +4293,7 @@
   case 151:
 
 /* Line 690 of lalr1.cc  */
-#line 2031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2031 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4305,7 +4305,7 @@
   case 152:
 
 /* Line 690 of lalr1.cc  */
-#line 2041 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2041 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4320,7 +4320,7 @@
   case 153:
 
 /* Line 690 of lalr1.cc  */
-#line 2051 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2051 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4335,7 +4335,7 @@
   case 154:
 
 /* Line 690 of lalr1.cc  */
-#line 2064 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2064 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4346,7 +4346,7 @@
   case 155:
 
 /* Line 690 of lalr1.cc  */
-#line 2070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2070 "/home/colea/xquery/new-jsoniq/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);
@@ -4356,7 +4356,7 @@
   case 156:
 
 /* Line 690 of lalr1.cc  */
-#line 2079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2079 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -4365,7 +4365,7 @@
   case 157:
 
 /* Line 690 of lalr1.cc  */
-#line 2084 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2084 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4377,7 +4377,7 @@
   case 158:
 
 /* Line 690 of lalr1.cc  */
-#line 2091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2091 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4389,7 +4389,7 @@
   case 159:
 
 /* Line 690 of lalr1.cc  */
-#line 2098 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2098 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4401,7 +4401,7 @@
   case 160:
 
 /* Line 690 of lalr1.cc  */
-#line 2110 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2110 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4414,7 +4414,7 @@
   case 161:
 
 /* Line 690 of lalr1.cc  */
-#line 2120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4427,7 +4427,7 @@
   case 162:
 
 /* Line 690 of lalr1.cc  */
-#line 2130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2130 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4440,7 +4440,7 @@
   case 163:
 
 /* Line 690 of lalr1.cc  */
-#line 2141 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2141 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4456,7 +4456,7 @@
   case 164:
 
 /* Line 690 of lalr1.cc  */
-#line 2157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2157 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4477,7 +4477,7 @@
   case 165:
 
 /* Line 690 of lalr1.cc  */
-#line 2177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2177 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4486,7 +4486,7 @@
   case 166:
 
 /* Line 690 of lalr1.cc  */
-#line 2181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2181 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4495,7 +4495,7 @@
   case 167:
 
 /* Line 690 of lalr1.cc  */
-#line 2185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2185 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) =  NULL;
     }
@@ -4504,7 +4504,7 @@
   case 168:
 
 /* Line 690 of lalr1.cc  */
-#line 2193 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2193 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4513,7 +4513,7 @@
   case 169:
 
 /* Line 690 of lalr1.cc  */
-#line 2197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2197 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4522,7 +4522,7 @@
   case 170:
 
 /* Line 690 of lalr1.cc  */
-#line 2201 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2201 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) =  new BlockBody(LOC((yyloc)));
     }
@@ -4531,7 +4531,7 @@
   case 171:
 
 /* Line 690 of lalr1.cc  */
-#line 2209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2209 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4540,7 +4540,7 @@
   case 172:
 
 /* Line 690 of lalr1.cc  */
-#line 2214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2214 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4553,7 +4553,7 @@
   case 173:
 
 /* Line 690 of lalr1.cc  */
-#line 2226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2226 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4564,7 +4564,7 @@
   case 174:
 
 /* Line 690 of lalr1.cc  */
-#line 2233 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2233 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4577,7 +4577,7 @@
   case 175:
 
 /* Line 690 of lalr1.cc  */
-#line 2243 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2243 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr); // to prevent the Bison warning
       (yyval.expr) = (yysemantic_stack_[(4) - (2)].expr); // to prevent the Bison warning
@@ -4593,7 +4593,7 @@
   case 189:
 
 /* Line 690 of lalr1.cc  */
-#line 2276 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2276 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4602,7 +4602,7 @@
   case 190:
 
 /* Line 690 of lalr1.cc  */
-#line 2284 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2284 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
       if ((yysemantic_stack_[(3) - (2)].expr) == NULL || (block != NULL && block->isEmpty()))
@@ -4625,7 +4625,7 @@
   case 191:
 
 /* Line 690 of lalr1.cc  */
-#line 2306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2306 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4634,7 +4634,7 @@
   case 192:
 
 /* Line 690 of lalr1.cc  */
-#line 2314 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2314 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4643,7 +4643,7 @@
   case 193:
 
 /* Line 690 of lalr1.cc  */
-#line 2322 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2322 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4654,7 +4654,7 @@
   case 194:
 
 /* Line 690 of lalr1.cc  */
-#line 2329 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2329 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4665,7 +4665,7 @@
   case 195:
 
 /* Line 690 of lalr1.cc  */
-#line 2336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2336 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4677,7 +4677,7 @@
   case 196:
 
 /* Line 690 of lalr1.cc  */
-#line 2347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2347 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4691,7 +4691,7 @@
   case 197:
 
 /* Line 690 of lalr1.cc  */
-#line 2356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2356 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4705,7 +4705,7 @@
   case 198:
 
 /* Line 690 of lalr1.cc  */
-#line 2365 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2365 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4719,7 +4719,7 @@
   case 199:
 
 /* Line 690 of lalr1.cc  */
-#line 2374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2374 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4733,7 +4733,7 @@
   case 200:
 
 /* Line 690 of lalr1.cc  */
-#line 2387 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2387 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -4742,7 +4742,7 @@
   case 201:
 
 /* Line 690 of lalr1.cc  */
-#line 2395 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2395 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4751,7 +4751,7 @@
   case 202:
 
 /* Line 690 of lalr1.cc  */
-#line 2403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2403 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4760,7 +4760,7 @@
   case 203:
 
 /* Line 690 of lalr1.cc  */
-#line 2411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2411 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4776,7 +4776,7 @@
   case 204:
 
 /* Line 690 of lalr1.cc  */
-#line 2426 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2426 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4785,7 +4785,7 @@
   case 205:
 
 /* Line 690 of lalr1.cc  */
-#line 2431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2431 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4794,7 +4794,7 @@
   case 206:
 
 /* Line 690 of lalr1.cc  */
-#line 2439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2439 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4809,7 +4809,7 @@
   case 207:
 
 /* Line 690 of lalr1.cc  */
-#line 2453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4827,7 +4827,7 @@
   case 208:
 
 /* Line 690 of lalr1.cc  */
-#line 2470 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2470 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4853,7 +4853,7 @@
   case 209:
 
 /* Line 690 of lalr1.cc  */
-#line 2495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2495 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4862,7 +4862,7 @@
   case 210:
 
 /* Line 690 of lalr1.cc  */
-#line 2503 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2503 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4873,7 +4873,7 @@
   case 211:
 
 /* Line 690 of lalr1.cc  */
-#line 2510 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2510 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4885,7 +4885,7 @@
   case 212:
 
 /* Line 690 of lalr1.cc  */
-#line 2521 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2521 "/home/colea/xquery/new-jsoniq/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);
@@ -4895,7 +4895,7 @@
   case 213:
 
 /* Line 690 of lalr1.cc  */
-#line 2530 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2530 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4904,7 +4904,7 @@
   case 214:
 
 /* Line 690 of lalr1.cc  */
-#line 2537 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2537 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4913,7 +4913,7 @@
   case 215:
 
 /* Line 690 of lalr1.cc  */
-#line 2542 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2542 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4929,7 +4929,7 @@
   case 216:
 
 /* Line 690 of lalr1.cc  */
-#line 2555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2555 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr); // to prevent the Bison warning
       (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
@@ -4947,7 +4947,7 @@
   case 235:
 
 /* Line 690 of lalr1.cc  */
-#line 2602 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2602 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4962,7 +4962,7 @@
   case 236:
 
 /* Line 690 of lalr1.cc  */
-#line 2616 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2616 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4971,7 +4971,7 @@
   case 237:
 
 /* Line 690 of lalr1.cc  */
-#line 2624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2624 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4980,7 +4980,7 @@
   case 238:
 
 /* Line 690 of lalr1.cc  */
-#line 2629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2629 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4989,7 +4989,7 @@
   case 239:
 
 /* Line 690 of lalr1.cc  */
-#line 2637 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2637 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4998,7 +4998,7 @@
   case 240:
 
 /* Line 690 of lalr1.cc  */
-#line 2642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2642 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -5007,7 +5007,7 @@
   case 241:
 
 /* Line 690 of lalr1.cc  */
-#line 2647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2647 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -5016,7 +5016,7 @@
   case 242:
 
 /* Line 690 of lalr1.cc  */
-#line 2655 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2655 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5029,7 +5029,7 @@
   case 243:
 
 /* Line 690 of lalr1.cc  */
-#line 2664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2664 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -5042,7 +5042,7 @@
   case 244:
 
 /* Line 690 of lalr1.cc  */
-#line 2676 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2676 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5057,7 +5057,7 @@
   case 245:
 
 /* Line 690 of lalr1.cc  */
-#line 2686 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2686 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5071,7 +5071,7 @@
   case 246:
 
 /* Line 690 of lalr1.cc  */
-#line 2699 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2699 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5080,7 +5080,7 @@
   case 255:
 
 /* Line 690 of lalr1.cc  */
-#line 2723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2723 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5091,7 +5091,7 @@
   case 256:
 
 /* Line 690 of lalr1.cc  */
-#line 2730 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2730 "/home/colea/xquery/new-jsoniq/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)) );
@@ -5102,7 +5102,7 @@
   case 257:
 
 /* Line 690 of lalr1.cc  */
-#line 2740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2740 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5111,7 +5111,7 @@
   case 258:
 
 /* Line 690 of lalr1.cc  */
-#line 2746 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2746 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -5124,7 +5124,7 @@
   case 259:
 
 /* Line 690 of lalr1.cc  */
-#line 2755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2755 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = NULL; // to prevent the Bison warning
       error((yylocation_stack_[(2) - (2)]), ""); // the error message is already set in the driver's parseError member
@@ -5135,7 +5135,7 @@
   case 261:
 
 /* Line 690 of lalr1.cc  */
-#line 2765 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2765 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       // this adds on shift-reduce conflict (probably with FTRange expression)
     }
@@ -5144,7 +5144,7 @@
   case 262:
 
 /* Line 690 of lalr1.cc  */
-#line 2773 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2773 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5155,7 +5155,7 @@
   case 263:
 
 /* Line 690 of lalr1.cc  */
-#line 2780 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2780 "/home/colea/xquery/new-jsoniq/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)) );
@@ -5166,7 +5166,7 @@
   case 264:
 
 /* Line 690 of lalr1.cc  */
-#line 2788 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2788 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -5179,7 +5179,7 @@
   case 265:
 
 /* Line 690 of lalr1.cc  */
-#line 2800 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2800 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5194,7 +5194,7 @@
   case 266:
 
 /* Line 690 of lalr1.cc  */
-#line 2810 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2810 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5209,7 +5209,7 @@
   case 267:
 
 /* Line 690 of lalr1.cc  */
-#line 2820 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2820 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5224,7 +5224,7 @@
   case 268:
 
 /* Line 690 of lalr1.cc  */
-#line 2830 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2830 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5239,7 +5239,7 @@
   case 269:
 
 /* Line 690 of lalr1.cc  */
-#line 2840 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2840 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5254,7 +5254,7 @@
   case 270:
 
 /* Line 690 of lalr1.cc  */
-#line 2850 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2850 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5269,7 +5269,7 @@
   case 271:
 
 /* Line 690 of lalr1.cc  */
-#line 2860 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2860 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5284,7 +5284,7 @@
   case 272:
 
 /* Line 690 of lalr1.cc  */
-#line 2870 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2870 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5299,7 +5299,7 @@
   case 273:
 
 /* Line 690 of lalr1.cc  */
-#line 2881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2881 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5313,7 +5313,7 @@
   case 274:
 
 /* Line 690 of lalr1.cc  */
-#line 2890 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2890 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5328,7 +5328,7 @@
   case 275:
 
 /* Line 690 of lalr1.cc  */
-#line 2900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2900 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5343,7 +5343,7 @@
   case 276:
 
 /* Line 690 of lalr1.cc  */
-#line 2910 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2910 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5358,7 +5358,7 @@
   case 277:
 
 /* Line 690 of lalr1.cc  */
-#line 2926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2926 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5367,7 +5367,7 @@
   case 278:
 
 /* Line 690 of lalr1.cc  */
-#line 2935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5376,7 +5376,7 @@
   case 279:
 
 /* Line 690 of lalr1.cc  */
-#line 2944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
@@ -5385,7 +5385,7 @@
   case 280:
 
 /* Line 690 of lalr1.cc  */
-#line 2952 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2952 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5396,7 +5396,7 @@
   case 281:
 
 /* Line 690 of lalr1.cc  */
-#line 2958 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2958 "/home/colea/xquery/new-jsoniq/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)) );
@@ -5407,7 +5407,7 @@
   case 282:
 
 /* Line 690 of lalr1.cc  */
-#line 2970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2970 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5420,7 +5420,7 @@
   case 283:
 
 /* Line 690 of lalr1.cc  */
-#line 2978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2978 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5433,7 +5433,7 @@
   case 284:
 
 /* Line 690 of lalr1.cc  */
-#line 2988 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2988 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5446,7 +5446,7 @@
   case 285:
 
 /* Line 690 of lalr1.cc  */
-#line 2996 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 2996 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5459,7 +5459,7 @@
   case 286:
 
 /* Line 690 of lalr1.cc  */
-#line 3008 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3008 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5470,7 +5470,7 @@
   case 287:
 
 /* Line 690 of lalr1.cc  */
-#line 3014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3014 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5482,7 +5482,7 @@
   case 289:
 
 /* Line 690 of lalr1.cc  */
-#line 3027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3027 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
@@ -5491,7 +5491,7 @@
   case 290:
 
 /* Line 690 of lalr1.cc  */
-#line 3031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3031 "/home/colea/xquery/new-jsoniq/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)));
@@ -5501,7 +5501,7 @@
   case 291:
 
 /* Line 690 of lalr1.cc  */
-#line 3039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3039 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
@@ -5510,7 +5510,7 @@
   case 292:
 
 /* Line 690 of lalr1.cc  */
-#line 3043 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3043 "/home/colea/xquery/new-jsoniq/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)));
@@ -5520,7 +5520,7 @@
   case 294:
 
 /* Line 690 of lalr1.cc  */
-#line 3052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3052 "/home/colea/xquery/new-jsoniq/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)));
     }
@@ -5529,7 +5529,7 @@
   case 295:
 
 /* Line 690 of lalr1.cc  */
-#line 3056 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3056 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5538,7 +5538,7 @@
   case 296:
 
 /* Line 690 of lalr1.cc  */
-#line 3060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3060 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
@@ -5547,7 +5547,7 @@
   case 297:
 
 /* Line 690 of lalr1.cc  */
-#line 3070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3070 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -5556,7 +5556,7 @@
   case 298:
 
 /* Line 690 of lalr1.cc  */
-#line 3078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3078 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5565,7 +5565,7 @@
   case 299:
 
 /* Line 690 of lalr1.cc  */
-#line 3085 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3085 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5576,7 +5576,7 @@
   case 300:
 
 /* Line 690 of lalr1.cc  */
-#line 3091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3091 "/home/colea/xquery/new-jsoniq/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)));
@@ -5587,7 +5587,7 @@
   case 301:
 
 /* Line 690 of lalr1.cc  */
-#line 3101 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3101 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
     }
@@ -5596,7 +5596,7 @@
   case 302:
 
 /* Line 690 of lalr1.cc  */
-#line 3105 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3105 "/home/colea/xquery/new-jsoniq/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);
     }
@@ -5605,7 +5605,7 @@
   case 303:
 
 /* Line 690 of lalr1.cc  */
-#line 3109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3109 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5618,7 +5618,7 @@
   case 304:
 
 /* Line 690 of lalr1.cc  */
-#line 3117 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3117 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5631,7 +5631,7 @@
   case 305:
 
 /* Line 690 of lalr1.cc  */
-#line 3125 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3125 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5644,7 +5644,7 @@
   case 306:
 
 /* Line 690 of lalr1.cc  */
-#line 3133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3133 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5657,7 +5657,7 @@
   case 307:
 
 /* Line 690 of lalr1.cc  */
-#line 3145 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3145 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -5666,7 +5666,7 @@
   case 308:
 
 /* Line 690 of lalr1.cc  */
-#line 3153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3153 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5677,7 +5677,7 @@
   case 309:
 
 /* Line 690 of lalr1.cc  */
-#line 3159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3159 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5688,7 +5688,7 @@
   case 310:
 
 /* Line 690 of lalr1.cc  */
-#line 3169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3169 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5699,7 +5699,7 @@
   case 311:
 
 /* Line 690 of lalr1.cc  */
-#line 3175 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3175 "/home/colea/xquery/new-jsoniq/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)) );
@@ -5710,7 +5710,7 @@
   case 312:
 
 /* Line 690 of lalr1.cc  */
-#line 3185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3185 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5719,7 +5719,7 @@
   case 313:
 
 /* Line 690 of lalr1.cc  */
-#line 3189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3189 "/home/colea/xquery/new-jsoniq/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))
@@ -5730,7 +5730,7 @@
   case 314:
 
 /* Line 690 of lalr1.cc  */
-#line 3199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3199 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5741,7 +5741,7 @@
   case 315:
 
 /* Line 690 of lalr1.cc  */
-#line 3205 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3205 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5752,7 +5752,7 @@
   case 316:
 
 /* Line 690 of lalr1.cc  */
-#line 3211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3211 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5763,7 +5763,7 @@
   case 317:
 
 /* Line 690 of lalr1.cc  */
-#line 3217 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3217 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5777,7 +5777,7 @@
   case 318:
 
 /* Line 690 of lalr1.cc  */
-#line 3226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3226 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5791,7 +5791,7 @@
   case 319:
 
 /* Line 690 of lalr1.cc  */
-#line 3235 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3235 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5805,7 +5805,7 @@
   case 320:
 
 /* Line 690 of lalr1.cc  */
-#line 3244 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3244 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5819,7 +5819,7 @@
   case 321:
 
 /* Line 690 of lalr1.cc  */
-#line 3257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3257 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5828,7 +5828,7 @@
   case 322:
 
 /* Line 690 of lalr1.cc  */
-#line 3261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3261 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5837,7 +5837,7 @@
   case 323:
 
 /* Line 690 of lalr1.cc  */
-#line 3269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3269 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5848,7 +5848,7 @@
   case 324:
 
 /* Line 690 of lalr1.cc  */
-#line 3275 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3275 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5859,7 +5859,7 @@
   case 325:
 
 /* Line 690 of lalr1.cc  */
-#line 3285 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3285 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5868,7 +5868,7 @@
   case 326:
 
 /* Line 690 of lalr1.cc  */
-#line 3293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3293 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5882,7 +5882,7 @@
   case 327:
 
 /* Line 690 of lalr1.cc  */
-#line 3302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3302 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5896,7 +5896,7 @@
   case 328:
 
 /* Line 690 of lalr1.cc  */
-#line 3315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3315 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5908,7 +5908,7 @@
   case 329:
 
 /* Line 690 of lalr1.cc  */
-#line 3322 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3322 "/home/colea/xquery/new-jsoniq/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)) );
@@ -5919,7 +5919,7 @@
   case 330:
 
 /* Line 690 of lalr1.cc  */
-#line 3334 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3334 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -5928,7 +5928,7 @@
   case 331:
 
 /* Line 690 of lalr1.cc  */
-#line 3338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3338 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5940,7 +5940,7 @@
   case 332:
 
 /* Line 690 of lalr1.cc  */
-#line 3350 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3350 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -5949,7 +5949,7 @@
   case 333:
 
 /* Line 690 of lalr1.cc  */
-#line 3357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3357 "/home/colea/xquery/new-jsoniq/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)));
@@ -5960,7 +5960,7 @@
   case 334:
 
 /* Line 690 of lalr1.cc  */
-#line 3363 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3363 "/home/colea/xquery/new-jsoniq/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)));
@@ -5971,7 +5971,7 @@
   case 335:
 
 /* Line 690 of lalr1.cc  */
-#line 3372 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3372 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -5980,7 +5980,7 @@
   case 336:
 
 /* Line 690 of lalr1.cc  */
-#line 3379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3379 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5991,7 +5991,7 @@
   case 337:
 
 /* Line 690 of lalr1.cc  */
-#line 3385 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3385 "/home/colea/xquery/new-jsoniq/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));
@@ -6002,7 +6002,7 @@
   case 338:
 
 /* Line 690 of lalr1.cc  */
-#line 3396 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3396 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -6011,7 +6011,7 @@
   case 339:
 
 /* Line 690 of lalr1.cc  */
-#line 3403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3403 "/home/colea/xquery/new-jsoniq/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)));
@@ -6022,7 +6022,7 @@
   case 340:
 
 /* Line 690 of lalr1.cc  */
-#line 3409 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3409 "/home/colea/xquery/new-jsoniq/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)));
@@ -6033,7 +6033,7 @@
   case 341:
 
 /* Line 690 of lalr1.cc  */
-#line 3418 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3418 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -6042,7 +6042,7 @@
   case 342:
 
 /* Line 690 of lalr1.cc  */
-#line 3427 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3427 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6054,7 +6054,7 @@
   case 343:
 
 /* Line 690 of lalr1.cc  */
-#line 3434 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3434 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6067,7 +6067,7 @@
   case 344:
 
 /* Line 690 of lalr1.cc  */
-#line 3445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3445 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6079,7 +6079,7 @@
   case 345:
 
 /* Line 690 of lalr1.cc  */
-#line 3452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3452 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6092,7 +6092,7 @@
   case 346:
 
 /* Line 690 of lalr1.cc  */
-#line 3464 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3464 "/home/colea/xquery/new-jsoniq/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)));
@@ -6103,7 +6103,7 @@
   case 347:
 
 /* Line 690 of lalr1.cc  */
-#line 3470 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3470 "/home/colea/xquery/new-jsoniq/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)));
@@ -6114,7 +6114,7 @@
   case 348:
 
 /* Line 690 of lalr1.cc  */
-#line 3482 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3482 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6125,7 +6125,7 @@
   case 349:
 
 /* Line 690 of lalr1.cc  */
-#line 3488 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3488 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6137,7 +6137,7 @@
   case 350:
 
 /* Line 690 of lalr1.cc  */
-#line 3499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3499 "/home/colea/xquery/new-jsoniq/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)));
@@ -6148,7 +6148,7 @@
   case 351:
 
 /* Line 690 of lalr1.cc  */
-#line 3505 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3505 "/home/colea/xquery/new-jsoniq/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)));
@@ -6159,7 +6159,7 @@
   case 352:
 
 /* Line 690 of lalr1.cc  */
-#line 3516 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3516 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6170,7 +6170,7 @@
   case 353:
 
 /* Line 690 of lalr1.cc  */
-#line 3522 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3522 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6182,7 +6182,7 @@
   case 354:
 
 /* Line 690 of lalr1.cc  */
-#line 3533 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3533 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6193,7 +6193,7 @@
   case 355:
 
 /* Line 690 of lalr1.cc  */
-#line 3539 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3539 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = static_cast<SequenceTypeList*>((yysemantic_stack_[(3) - (1)].node));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)));
@@ -6204,7 +6204,7 @@
   case 356:
 
 /* Line 690 of lalr1.cc  */
-#line 3550 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3550 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -6213,7 +6213,7 @@
   case 357:
 
 /* Line 690 of lalr1.cc  */
-#line 3559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3559 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6222,7 +6222,7 @@
   case 358:
 
 /* Line 690 of lalr1.cc  */
-#line 3563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3563 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
@@ -6231,7 +6231,7 @@
   case 359:
 
 /* Line 690 of lalr1.cc  */
-#line 3572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3572 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6240,7 +6240,7 @@
   case 360:
 
 /* Line 690 of lalr1.cc  */
-#line 3576 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3576 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6249,7 +6249,7 @@
   case 361:
 
 /* Line 690 of lalr1.cc  */
-#line 3583 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3583 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6258,7 +6258,7 @@
   case 362:
 
 /* Line 690 of lalr1.cc  */
-#line 3587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3587 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new ComparisonExpr(
               LOC((yyloc)),
@@ -6272,7 +6272,7 @@
   case 363:
 
 /* Line 690 of lalr1.cc  */
-#line 3600 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3600 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6281,7 +6281,7 @@
   case 364:
 
 /* Line 690 of lalr1.cc  */
-#line 3604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3604 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
@@ -6296,7 +6296,7 @@
   case 365:
 
 /* Line 690 of lalr1.cc  */
-#line 3684 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3684 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6305,7 +6305,7 @@
   case 366:
 
 /* Line 690 of lalr1.cc  */
-#line 3688 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3688 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6319,7 +6319,7 @@
   case 367:
 
 /* Line 690 of lalr1.cc  */
-#line 3700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3700 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6328,7 +6328,7 @@
   case 368:
 
 /* Line 690 of lalr1.cc  */
-#line 3704 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3704 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
@@ -6337,7 +6337,7 @@
   case 369:
 
 /* Line 690 of lalr1.cc  */
-#line 3711 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3711 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -6346,7 +6346,7 @@
   case 370:
 
 /* Line 690 of lalr1.cc  */
-#line 3715 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3715 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -6355,7 +6355,7 @@
   case 371:
 
 /* Line 690 of lalr1.cc  */
-#line 3722 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3722 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6364,7 +6364,7 @@
   case 372:
 
 /* Line 690 of lalr1.cc  */
-#line 3726 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3726 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6373,7 +6373,7 @@
   case 373:
 
 /* Line 690 of lalr1.cc  */
-#line 3735 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3735 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6382,7 +6382,7 @@
   case 374:
 
 /* Line 690 of lalr1.cc  */
-#line 3739 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3739 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -6391,7 +6391,7 @@
   case 375:
 
 /* Line 690 of lalr1.cc  */
-#line 3743 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3743 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -6400,7 +6400,7 @@
   case 376:
 
 /* Line 690 of lalr1.cc  */
-#line 3751 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3751 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6409,7 +6409,7 @@
   case 377:
 
 /* Line 690 of lalr1.cc  */
-#line 3755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3755 "/home/colea/xquery/new-jsoniq/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)
@@ -6420,7 +6420,7 @@
   case 378:
 
 /* Line 690 of lalr1.cc  */
-#line 3761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3761 "/home/colea/xquery/new-jsoniq/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)
@@ -6431,7 +6431,7 @@
   case 379:
 
 /* Line 690 of lalr1.cc  */
-#line 3767 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3767 "/home/colea/xquery/new-jsoniq/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)
@@ -6442,7 +6442,7 @@
   case 380:
 
 /* Line 690 of lalr1.cc  */
-#line 3773 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3773 "/home/colea/xquery/new-jsoniq/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)
@@ -6453,7 +6453,7 @@
   case 381:
 
 /* Line 690 of lalr1.cc  */
-#line 3783 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3783 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6462,7 +6462,7 @@
   case 382:
 
 /* Line 690 of lalr1.cc  */
-#line 3787 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3787 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6471,7 +6471,7 @@
   case 383:
 
 /* Line 690 of lalr1.cc  */
-#line 3791 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3791 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6480,7 +6480,7 @@
   case 384:
 
 /* Line 690 of lalr1.cc  */
-#line 3799 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3799 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6489,7 +6489,7 @@
   case 385:
 
 /* Line 690 of lalr1.cc  */
-#line 3803 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3803 "/home/colea/xquery/new-jsoniq/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)
@@ -6500,7 +6500,7 @@
   case 386:
 
 /* Line 690 of lalr1.cc  */
-#line 3809 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3809 "/home/colea/xquery/new-jsoniq/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)
@@ -6511,7 +6511,7 @@
   case 387:
 
 /* Line 690 of lalr1.cc  */
-#line 3819 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3819 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6520,7 +6520,7 @@
   case 388:
 
 /* Line 690 of lalr1.cc  */
-#line 3823 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3823 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InstanceofExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6531,7 +6531,7 @@
   case 389:
 
 /* Line 690 of lalr1.cc  */
-#line 3833 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3833 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6540,7 +6540,7 @@
   case 390:
 
 /* Line 690 of lalr1.cc  */
-#line 3837 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3837 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new TreatExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6551,7 +6551,7 @@
   case 391:
 
 /* Line 690 of lalr1.cc  */
-#line 3847 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3847 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6560,7 +6560,7 @@
   case 392:
 
 /* Line 690 of lalr1.cc  */
-#line 3851 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3851 "/home/colea/xquery/new-jsoniq/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))
@@ -6571,7 +6571,7 @@
   case 393:
 
 /* Line 690 of lalr1.cc  */
-#line 3861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3861 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6580,7 +6580,7 @@
   case 394:
 
 /* Line 690 of lalr1.cc  */
-#line 3865 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3865 "/home/colea/xquery/new-jsoniq/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))
@@ -6591,7 +6591,7 @@
   case 395:
 
 /* Line 690 of lalr1.cc  */
-#line 3875 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3875 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
     }
@@ -6600,7 +6600,7 @@
   case 396:
 
 /* Line 690 of lalr1.cc  */
-#line 3879 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3879 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
     }
@@ -6609,7 +6609,7 @@
   case 397:
 
 /* Line 690 of lalr1.cc  */
-#line 3888 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3888 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6618,7 +6618,7 @@
   case 398:
 
 /* Line 690 of lalr1.cc  */
-#line 3892 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3892 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -6627,7 +6627,7 @@
   case 399:
 
 /* Line 690 of lalr1.cc  */
-#line 3900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3900 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
@@ -6636,7 +6636,7 @@
   case 400:
 
 /* Line 690 of lalr1.cc  */
-#line 3904 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3904 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), false );
         }
@@ -6645,7 +6645,7 @@
   case 401:
 
 /* Line 690 of lalr1.cc  */
-#line 3908 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3908 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -6654,7 +6654,7 @@
   case 402:
 
 /* Line 690 of lalr1.cc  */
-#line 3912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3912 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6665,7 +6665,7 @@
   case 403:
 
 /* Line 690 of lalr1.cc  */
-#line 3922 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3922 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6674,7 +6674,7 @@
   case 404:
 
 /* Line 690 of lalr1.cc  */
-#line 3926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3926 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6683,7 +6683,7 @@
   case 405:
 
 /* Line 690 of lalr1.cc  */
-#line 3930 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3930 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6692,7 +6692,7 @@
   case 406:
 
 /* Line 690 of lalr1.cc  */
-#line 3937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3937 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
       }
@@ -6701,7 +6701,7 @@
   case 407:
 
 /* Line 690 of lalr1.cc  */
-#line 3942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3942 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
       }
@@ -6710,7 +6710,7 @@
   case 408:
 
 /* Line 690 of lalr1.cc  */
-#line 3950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3950 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
@@ -6719,7 +6719,7 @@
   case 409:
 
 /* Line 690 of lalr1.cc  */
-#line 3954 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3954 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
@@ -6728,7 +6728,7 @@
   case 410:
 
 /* Line 690 of lalr1.cc  */
-#line 3958 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3958 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
@@ -6737,7 +6737,7 @@
   case 411:
 
 /* Line 690 of lalr1.cc  */
-#line 3962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3962 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
@@ -6746,7 +6746,7 @@
   case 412:
 
 /* Line 690 of lalr1.cc  */
-#line 3966 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3966 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
@@ -6755,7 +6755,7 @@
   case 413:
 
 /* Line 690 of lalr1.cc  */
-#line 3970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3970 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
@@ -6764,7 +6764,7 @@
   case 414:
 
 /* Line 690 of lalr1.cc  */
-#line 3994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3994 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6773,7 +6773,7 @@
   case 415:
 
 /* Line 690 of lalr1.cc  */
-#line 3998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 3998 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6782,7 +6782,7 @@
   case 416:
 
 /* Line 690 of lalr1.cc  */
-#line 4002 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4002 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6791,7 +6791,7 @@
   case 417:
 
 /* Line 690 of lalr1.cc  */
-#line 4006 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4006 "/home/colea/xquery/new-jsoniq/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)
@@ -6803,7 +6803,7 @@
   case 418:
 
 /* Line 690 of lalr1.cc  */
-#line 4017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4017 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6814,7 +6814,7 @@
   case 419:
 
 /* Line 690 of lalr1.cc  */
-#line 4023 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4023 "/home/colea/xquery/new-jsoniq/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)
@@ -6825,7 +6825,7 @@
   case 420:
 
 /* Line 690 of lalr1.cc  */
-#line 4033 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4033 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6836,7 +6836,7 @@
   case 421:
 
 /* Line 690 of lalr1.cc  */
-#line 4039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4039 "/home/colea/xquery/new-jsoniq/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)) );
@@ -6847,7 +6847,7 @@
   case 422:
 
 /* Line 690 of lalr1.cc  */
-#line 4049 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4049 "/home/colea/xquery/new-jsoniq/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)) );
         }
@@ -6856,7 +6856,7 @@
   case 423:
 
 /* Line 690 of lalr1.cc  */
-#line 4053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4053 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
@@ -6865,7 +6865,7 @@
   case 424:
 
 /* Line 690 of lalr1.cc  */
-#line 4057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4057 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
@@ -6874,7 +6874,7 @@
   case 425:
 
 /* Line 690 of lalr1.cc  */
-#line 4120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (!rpe ?
@@ -6886,7 +6886,7 @@
   case 426:
 
 /* Line 690 of lalr1.cc  */
-#line 4142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6901,7 +6901,7 @@
   case 427:
 
 /* Line 690 of lalr1.cc  */
-#line 4170 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4170 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6910,7 +6910,7 @@
   case 428:
 
 /* Line 690 of lalr1.cc  */
-#line 4334 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4334 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -6919,7 +6919,7 @@
   case 429:
 
 /* Line 690 of lalr1.cc  */
-#line 4338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4338 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
@@ -6928,7 +6928,7 @@
   case 430:
 
 /* Line 690 of lalr1.cc  */
-#line 4348 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4348 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
@@ -6937,7 +6937,7 @@
   case 431:
 
 /* Line 690 of lalr1.cc  */
-#line 4352 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4352 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
@@ -6946,7 +6946,7 @@
   case 432:
 
 /* Line 690 of lalr1.cc  */
-#line 4356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4356 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
@@ -6955,7 +6955,7 @@
   case 433:
 
 /* Line 690 of lalr1.cc  */
-#line 4360 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4360 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
@@ -6964,7 +6964,7 @@
   case 434:
 
 /* Line 690 of lalr1.cc  */
-#line 4369 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4369 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
@@ -6973,7 +6973,7 @@
   case 435:
 
 /* Line 690 of lalr1.cc  */
-#line 4373 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4373 "/home/colea/xquery/new-jsoniq/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)));
      }
@@ -6982,7 +6982,7 @@
   case 436:
 
 /* Line 690 of lalr1.cc  */
-#line 4377 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4377 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
      }
@@ -6991,7 +6991,7 @@
   case 437:
 
 /* Line 690 of lalr1.cc  */
-#line 4381 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4381 "/home/colea/xquery/new-jsoniq/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);
      }
@@ -7000,7 +7000,7 @@
   case 438:
 
 /* Line 690 of lalr1.cc  */
-#line 4385 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4385 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), sl);
@@ -7010,7 +7010,7 @@
   case 439:
 
 /* Line 690 of lalr1.cc  */
-#line 4390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4390 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7019,7 +7019,7 @@
   case 440:
 
 /* Line 690 of lalr1.cc  */
-#line 4394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4394 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7028,7 +7028,7 @@
   case 441:
 
 /* Line 690 of lalr1.cc  */
-#line 4398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4398 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7037,7 +7037,7 @@
   case 442:
 
 /* Line 690 of lalr1.cc  */
-#line 4407 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4407 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             PredicateList *pl = new PredicateList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7048,7 +7048,7 @@
   case 443:
 
 /* Line 690 of lalr1.cc  */
-#line 4413 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4413 "/home/colea/xquery/new-jsoniq/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)) );
@@ -7059,7 +7059,7 @@
   case 444:
 
 /* Line 690 of lalr1.cc  */
-#line 4423 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4423 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
@@ -7068,7 +7068,7 @@
   case 445:
 
 /* Line 690 of lalr1.cc  */
-#line 4431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4431 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7077,7 +7077,7 @@
   case 446:
 
 /* Line 690 of lalr1.cc  */
-#line 4435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4435 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7086,7 +7086,7 @@
   case 447:
 
 /* Line 690 of lalr1.cc  */
-#line 4439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4439 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7095,7 +7095,7 @@
   case 448:
 
 /* Line 690 of lalr1.cc  */
-#line 4443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4443 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7104,7 +7104,7 @@
   case 449:
 
 /* Line 690 of lalr1.cc  */
-#line 4447 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4447 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7113,7 +7113,7 @@
   case 450:
 
 /* Line 690 of lalr1.cc  */
-#line 4451 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4451 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7122,7 +7122,7 @@
   case 451:
 
 /* Line 690 of lalr1.cc  */
-#line 4455 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4455 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7131,7 +7131,7 @@
   case 452:
 
 /* Line 690 of lalr1.cc  */
-#line 4459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4459 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7140,7 +7140,7 @@
   case 453:
 
 /* Line 690 of lalr1.cc  */
-#line 4463 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4463 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7149,7 +7149,7 @@
   case 454:
 
 /* Line 690 of lalr1.cc  */
-#line 4467 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4467 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7158,7 +7158,7 @@
   case 455:
 
 /* Line 690 of lalr1.cc  */
-#line 4472 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4472 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7167,7 +7167,7 @@
   case 456:
 
 /* Line 690 of lalr1.cc  */
-#line 4476 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4476 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7176,7 +7176,7 @@
   case 457:
 
 /* Line 690 of lalr1.cc  */
-#line 4480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4480 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7185,7 +7185,7 @@
   case 458:
 
 /* Line 690 of lalr1.cc  */
-#line 4484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4484 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7194,7 +7194,7 @@
   case 459:
 
 /* Line 690 of lalr1.cc  */
-#line 4492 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4492 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7203,7 +7203,7 @@
   case 460:
 
 /* Line 690 of lalr1.cc  */
-#line 4496 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4496 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7212,7 +7212,7 @@
   case 461:
 
 /* Line 690 of lalr1.cc  */
-#line 4500 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4500 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7221,7 +7221,7 @@
   case 462:
 
 /* Line 690 of lalr1.cc  */
-#line 4504 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4504 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new NullLiteral(LOC((yyloc)));
         }
@@ -7230,7 +7230,7 @@
   case 463:
 
 /* Line 690 of lalr1.cc  */
-#line 4512 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4512 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7242,7 +7242,7 @@
   case 464:
 
 /* Line 690 of lalr1.cc  */
-#line 4519 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4519 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7254,7 +7254,7 @@
   case 465:
 
 /* Line 690 of lalr1.cc  */
-#line 4526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4526 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7266,7 +7266,7 @@
   case 466:
 
 /* Line 690 of lalr1.cc  */
-#line 4536 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4536 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), true);
         }
@@ -7275,7 +7275,7 @@
   case 467:
 
 /* Line 690 of lalr1.cc  */
-#line 4540 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4540 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), false);
         }
@@ -7284,7 +7284,7 @@
   case 468:
 
 /* Line 690 of lalr1.cc  */
-#line 4548 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4548 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
@@ -7293,7 +7293,7 @@
   case 469:
 
 /* Line 690 of lalr1.cc  */
-#line 4556 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4556 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
@@ -7302,7 +7302,7 @@
   case 470:
 
 /* Line 690 of lalr1.cc  */
-#line 4560 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4560 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -7311,7 +7311,7 @@
   case 471:
 
 /* Line 690 of lalr1.cc  */
-#line 4568 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4568 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7320,7 +7320,7 @@
   case 472:
 
 /* Line 690 of lalr1.cc  */
-#line 4572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4572 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7329,7 +7329,7 @@
   case 473:
 
 /* Line 690 of lalr1.cc  */
-#line 4580 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4580 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7338,7 +7338,7 @@
   case 474:
 
 /* Line 690 of lalr1.cc  */
-#line 4588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4588 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7347,7 +7347,7 @@
   case 475:
 
 /* Line 690 of lalr1.cc  */
-#line 4642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4642 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
     }
@@ -7356,7 +7356,7 @@
   case 476:
 
 /* Line 690 of lalr1.cc  */
-#line 4646 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4646 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
 
@@ -7379,7 +7379,7 @@
   case 477:
 
 /* Line 690 of lalr1.cc  */
-#line 4668 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4668 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -7390,7 +7390,7 @@
   case 478:
 
 /* Line 690 of lalr1.cc  */
-#line 4674 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4674 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
         al->push_back( new ArgumentPlaceholder(LOC((yyloc))) );
@@ -7401,7 +7401,7 @@
   case 479:
 
 /* Line 690 of lalr1.cc  */
-#line 4680 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4680 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7412,7 +7412,7 @@
   case 480:
 
 /* Line 690 of lalr1.cc  */
-#line 4686 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4686 "/home/colea/xquery/new-jsoniq/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) );
@@ -7423,7 +7423,7 @@
   case 481:
 
 /* Line 690 of lalr1.cc  */
-#line 4696 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4696 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7432,7 +7432,7 @@
   case 482:
 
 /* Line 690 of lalr1.cc  */
-#line 4700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4700 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7441,7 +7441,7 @@
   case 483:
 
 /* Line 690 of lalr1.cc  */
-#line 4708 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4708 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -7450,7 +7450,7 @@
   case 484:
 
 /* Line 690 of lalr1.cc  */
-#line 4716 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4716 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -7463,7 +7463,7 @@
   case 485:
 
 /* Line 690 of lalr1.cc  */
-#line 4728 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4728 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7472,7 +7472,7 @@
   case 486:
 
 /* Line 690 of lalr1.cc  */
-#line 4732 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4732 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7481,7 +7481,7 @@
   case 487:
 
 /* Line 690 of lalr1.cc  */
-#line 4740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4740 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7490,7 +7490,7 @@
   case 488:
 
 /* Line 690 of lalr1.cc  */
-#line 4744 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4744 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7499,7 +7499,7 @@
   case 489:
 
 /* Line 690 of lalr1.cc  */
-#line 4748 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4748 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7508,7 +7508,7 @@
   case 490:
 
 /* Line 690 of lalr1.cc  */
-#line 4756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4756 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -7521,7 +7521,7 @@
   case 491:
 
 /* Line 690 of lalr1.cc  */
-#line 4764 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4764 "/home/colea/xquery/new-jsoniq/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())
       {
@@ -7543,7 +7543,7 @@
   case 492:
 
 /* Line 690 of lalr1.cc  */
-#line 4781 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4781 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7556,7 +7556,7 @@
   case 493:
 
 /* Line 690 of lalr1.cc  */
-#line 4789 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4789 "/home/colea/xquery/new-jsoniq/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())
       {
@@ -7578,7 +7578,7 @@
   case 494:
 
 /* Line 690 of lalr1.cc  */
-#line 4808 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4808 "/home/colea/xquery/new-jsoniq/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())
       {
@@ -7600,7 +7600,7 @@
   case 495:
 
 /* Line 690 of lalr1.cc  */
-#line 4827 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4827 "/home/colea/xquery/new-jsoniq/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())
       {
@@ -7622,7 +7622,7 @@
   case 496:
 
 /* Line 690 of lalr1.cc  */
-#line 4849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4849 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
       decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7633,7 +7633,7 @@
   case 497:
 
 /* Line 690 of lalr1.cc  */
-#line 4855 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4855 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( decl )
@@ -7645,7 +7645,7 @@
   case 498:
 
 /* Line 690 of lalr1.cc  */
-#line 4866 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4866 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
       dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7656,7 +7656,7 @@
   case 499:
 
 /* Line 690 of lalr1.cc  */
-#line 4872 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4872 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
       if ( dal )
@@ -7668,7 +7668,7 @@
   case 500:
 
 /* Line 690 of lalr1.cc  */
-#line 4883 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4883 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttr(LOC((yyloc)),
                        static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7679,7 +7679,7 @@
   case 503:
 
 /* Line 690 of lalr1.cc  */
-#line 4898 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4898 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue(LOC((yyloc)),
                                  dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7689,7 +7689,7 @@
   case 504:
 
 /* Line 690 of lalr1.cc  */
-#line 4903 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4903 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                   dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7699,7 +7699,7 @@
   case 505:
 
 /* Line 690 of lalr1.cc  */
-#line 4912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4912 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
     }
@@ -7708,7 +7708,7 @@
   case 506:
 
 /* Line 690 of lalr1.cc  */
-#line 4916 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4916 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7717,7 +7717,7 @@
   case 507:
 
 /* Line 690 of lalr1.cc  */
-#line 4923 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4923 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7728,7 +7728,7 @@
   case 508:
 
 /* Line 690 of lalr1.cc  */
-#line 4929 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4929 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7739,7 +7739,7 @@
   case 509:
 
 /* Line 690 of lalr1.cc  */
-#line 4935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7751,7 +7751,7 @@
   case 510:
 
 /* Line 690 of lalr1.cc  */
-#line 4942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4942 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7763,7 +7763,7 @@
   case 511:
 
 /* Line 690 of lalr1.cc  */
-#line 4953 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4953 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
     }
@@ -7772,7 +7772,7 @@
   case 512:
 
 /* Line 690 of lalr1.cc  */
-#line 4957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4957 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7781,7 +7781,7 @@
   case 513:
 
 /* Line 690 of lalr1.cc  */
-#line 4964 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4964 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7792,7 +7792,7 @@
   case 514:
 
 /* Line 690 of lalr1.cc  */
-#line 4970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4970 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7803,7 +7803,7 @@
   case 515:
 
 /* Line 690 of lalr1.cc  */
-#line 4976 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4976 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if (aacl)
@@ -7815,7 +7815,7 @@
   case 516:
 
 /* Line 690 of lalr1.cc  */
-#line 4983 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4983 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( aacl )
@@ -7827,7 +7827,7 @@
   case 517:
 
 /* Line 690 of lalr1.cc  */
-#line 4994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4994 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7836,7 +7836,7 @@
   case 518:
 
 /* Line 690 of lalr1.cc  */
-#line 4998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 4998 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7845,7 +7845,7 @@
   case 519:
 
 /* Line 690 of lalr1.cc  */
-#line 5006 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5006 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7854,7 +7854,7 @@
   case 520:
 
 /* Line 690 of lalr1.cc  */
-#line 5010 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5010 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7863,7 +7863,7 @@
   case 521:
 
 /* Line 690 of lalr1.cc  */
-#line 5018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5018 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
     }
@@ -7872,7 +7872,7 @@
   case 522:
 
 /* Line 690 of lalr1.cc  */
-#line 5022 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5022 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7881,7 +7881,7 @@
   case 523:
 
 /* Line 690 of lalr1.cc  */
-#line 5026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5026 "/home/colea/xquery/new-jsoniq/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 );
@@ -7891,7 +7891,7 @@
   case 524:
 
 /* Line 690 of lalr1.cc  */
-#line 5031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5031 "/home/colea/xquery/new-jsoniq/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 );
@@ -7901,7 +7901,7 @@
   case 525:
 
 /* Line 690 of lalr1.cc  */
-#line 5040 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5040 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
     }
@@ -7910,7 +7910,7 @@
   case 526:
 
 /* Line 690 of lalr1.cc  */
-#line 5044 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5044 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
     }
@@ -7919,7 +7919,7 @@
   case 527:
 
 /* Line 690 of lalr1.cc  */
-#line 5048 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5048 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
     }
@@ -7928,7 +7928,7 @@
   case 528:
 
 /* Line 690 of lalr1.cc  */
-#line 5052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5052 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
     }
@@ -7937,7 +7937,7 @@
   case 529:
 
 /* Line 690 of lalr1.cc  */
-#line 5060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5060 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7946,7 +7946,7 @@
   case 530:
 
 /* Line 690 of lalr1.cc  */
-#line 5065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5065 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
@@ -7955,7 +7955,7 @@
   case 531:
 
 /* Line 690 of lalr1.cc  */
-#line 5073 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5073 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7964,7 +7964,7 @@
   case 532:
 
 /* Line 690 of lalr1.cc  */
-#line 5078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5078 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -7973,7 +7973,7 @@
   case 533:
 
 /* Line 690 of lalr1.cc  */
-#line 5086 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5086 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -7982,7 +7982,7 @@
   case 534:
 
 /* Line 690 of lalr1.cc  */
-#line 5094 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5094 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7991,7 +7991,7 @@
   case 535:
 
 /* Line 690 of lalr1.cc  */
-#line 5099 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5099 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8000,7 +8000,7 @@
   case 536:
 
 /* Line 690 of lalr1.cc  */
-#line 5104 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5104 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8009,7 +8009,7 @@
   case 537:
 
 /* Line 690 of lalr1.cc  */
-#line 5109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5109 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8018,7 +8018,7 @@
   case 538:
 
 /* Line 690 of lalr1.cc  */
-#line 5114 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5114 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8027,7 +8027,7 @@
   case 539:
 
 /* Line 690 of lalr1.cc  */
-#line 5119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5119 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8036,7 +8036,7 @@
   case 541:
 
 /* Line 690 of lalr1.cc  */
-#line 5130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5130 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8045,7 +8045,7 @@
   case 542:
 
 /* Line 690 of lalr1.cc  */
-#line 5138 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5138 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -8054,7 +8054,7 @@
   case 543:
 
 /* Line 690 of lalr1.cc  */
-#line 5142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8063,7 +8063,7 @@
   case 544:
 
 /* Line 690 of lalr1.cc  */
-#line 5159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5159 "/home/colea/xquery/new-jsoniq/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) );
     }
@@ -8072,7 +8072,7 @@
   case 545:
 
 /* Line 690 of lalr1.cc  */
-#line 5163 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5163 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8081,7 +8081,7 @@
   case 546:
 
 /* Line 690 of lalr1.cc  */
-#line 5171 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5171 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8090,7 +8090,7 @@
   case 547:
 
 /* Line 690 of lalr1.cc  */
-#line 5179 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5179 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8099,7 +8099,7 @@
   case 548:
 
 /* Line 690 of lalr1.cc  */
-#line 5187 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5187 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8108,7 +8108,7 @@
   case 549:
 
 /* Line 690 of lalr1.cc  */
-#line 5191 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5191 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8117,7 +8117,7 @@
   case 550:
 
 /* Line 690 of lalr1.cc  */
-#line 5199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5199 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8126,7 +8126,7 @@
   case 551:
 
 /* Line 690 of lalr1.cc  */
-#line 5203 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5203 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8135,7 +8135,7 @@
   case 552:
 
 /* Line 690 of lalr1.cc  */
-#line 5211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5211 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -8144,7 +8144,7 @@
   case 553:
 
 /* Line 690 of lalr1.cc  */
-#line 5219 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5219 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
@@ -8153,7 +8153,7 @@
   case 554:
 
 /* Line 690 of lalr1.cc  */
-#line 5223 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5223 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
         }
@@ -8162,7 +8162,7 @@
   case 555:
 
 /* Line 690 of lalr1.cc  */
-#line 5227 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5227 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8171,7 +8171,7 @@
   case 556:
 
 /* Line 690 of lalr1.cc  */
-#line 5232 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5232 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8180,7 +8180,7 @@
   case 557:
 
 /* Line 690 of lalr1.cc  */
-#line 5267 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5267 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8191,7 +8191,7 @@
   case 558:
 
 /* Line 690 of lalr1.cc  */
-#line 5273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5273 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8202,7 +8202,7 @@
   case 559:
 
 /* Line 690 of lalr1.cc  */
-#line 5279 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5279 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8213,7 +8213,7 @@
   case 560:
 
 /* Line 690 of lalr1.cc  */
-#line 5289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5289 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8222,7 +8222,7 @@
   case 561:
 
 /* Line 690 of lalr1.cc  */
-#line 5293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5293 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8231,7 +8231,7 @@
   case 562:
 
 /* Line 690 of lalr1.cc  */
-#line 5297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5297 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8240,7 +8240,7 @@
   case 563:
 
 /* Line 690 of lalr1.cc  */
-#line 5302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5302 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8249,7 +8249,7 @@
   case 564:
 
 /* Line 690 of lalr1.cc  */
-#line 5306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5306 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8258,7 +8258,7 @@
   case 565:
 
 /* Line 690 of lalr1.cc  */
-#line 5311 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5311 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8267,7 +8267,7 @@
   case 566:
 
 /* Line 690 of lalr1.cc  */
-#line 5315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5315 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8276,7 +8276,7 @@
   case 567:
 
 /* Line 690 of lalr1.cc  */
-#line 5319 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5319 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8285,7 +8285,7 @@
   case 568:
 
 /* Line 690 of lalr1.cc  */
-#line 5323 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5323 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8294,7 +8294,7 @@
   case 569:
 
 /* Line 690 of lalr1.cc  */
-#line 5330 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5330 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8305,7 +8305,7 @@
   case 570:
 
 /* Line 690 of lalr1.cc  */
-#line 5336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5336 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
@@ -8316,7 +8316,7 @@
   case 571:
 
 /* Line 690 of lalr1.cc  */
-#line 5346 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5346 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8325,7 +8325,7 @@
   case 572:
 
 /* Line 690 of lalr1.cc  */
-#line 5354 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5354 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8334,7 +8334,7 @@
   case 573:
 
 /* Line 690 of lalr1.cc  */
-#line 5362 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5362 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8343,7 +8343,7 @@
   case 574:
 
 /* Line 690 of lalr1.cc  */
-#line 5366 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5366 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8352,7 +8352,7 @@
   case 575:
 
 /* Line 690 of lalr1.cc  */
-#line 5370 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5370 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8361,7 +8361,7 @@
   case 576:
 
 /* Line 690 of lalr1.cc  */
-#line 5374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5374 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8370,7 +8370,7 @@
   case 577:
 
 /* Line 690 of lalr1.cc  */
-#line 5378 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5378 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8379,7 +8379,7 @@
   case 578:
 
 /* Line 690 of lalr1.cc  */
-#line 5382 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5382 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8388,7 +8388,7 @@
   case 579:
 
 /* Line 690 of lalr1.cc  */
-#line 5386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5386 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8397,7 +8397,7 @@
   case 580:
 
 /* Line 690 of lalr1.cc  */
-#line 5390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5390 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8406,7 +8406,7 @@
   case 581:
 
 /* Line 690 of lalr1.cc  */
-#line 5394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5394 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8415,7 +8415,7 @@
   case 582:
 
 /* Line 690 of lalr1.cc  */
-#line 5398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5398 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8424,7 +8424,7 @@
   case 583:
 
 /* Line 690 of lalr1.cc  */
-#line 5406 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5406 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyKindTest( LOC((yyloc)) );
     }
@@ -8433,7 +8433,7 @@
   case 584:
 
 /* Line 690 of lalr1.cc  */
-#line 5414 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5414 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)));
     }
@@ -8442,7 +8442,7 @@
   case 585:
 
 /* Line 690 of lalr1.cc  */
-#line 5418 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5418 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8451,7 +8451,7 @@
   case 586:
 
 /* Line 690 of lalr1.cc  */
-#line 5422 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5422 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8460,7 +8460,7 @@
   case 587:
 
 /* Line 690 of lalr1.cc  */
-#line 5430 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5430 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new NamespaceTest(LOC((yyloc)));
     }
@@ -8469,7 +8469,7 @@
   case 588:
 
 /* Line 690 of lalr1.cc  */
-#line 5437 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5437 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new TextTest(LOC((yyloc)));
     }
@@ -8478,7 +8478,7 @@
   case 589:
 
 /* Line 690 of lalr1.cc  */
-#line 5445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5445 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CommentTest(LOC((yyloc)));
     }
@@ -8487,7 +8487,7 @@
   case 590:
 
 /* Line 690 of lalr1.cc  */
-#line 5453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
@@ -8496,7 +8496,7 @@
   case 591:
 
 /* Line 690 of lalr1.cc  */
-#line 5457 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5457 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8505,7 +8505,7 @@
   case 592:
 
 /* Line 690 of lalr1.cc  */
-#line 5461 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5461 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8514,7 +8514,7 @@
   case 593:
 
 /* Line 690 of lalr1.cc  */
-#line 5469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5469 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8523,7 +8523,7 @@
   case 594:
 
 /* Line 690 of lalr1.cc  */
-#line 5473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5473 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -8534,7 +8534,7 @@
   case 595:
 
 /* Line 690 of lalr1.cc  */
-#line 5479 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5479 "/home/colea/xquery/new-jsoniq/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))
@@ -8545,7 +8545,7 @@
   case 596:
 
 /* Line 690 of lalr1.cc  */
-#line 5485 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5485 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8554,7 +8554,7 @@
   case 597:
 
 /* Line 690 of lalr1.cc  */
-#line 5489 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5489 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8565,7 +8565,7 @@
   case 598:
 
 /* Line 690 of lalr1.cc  */
-#line 5499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5499 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8574,7 +8574,7 @@
   case 599:
 
 /* Line 690 of lalr1.cc  */
-#line 5507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5507 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
@@ -8583,7 +8583,7 @@
   case 600:
 
 /* Line 690 of lalr1.cc  */
-#line 5511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5511 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -8594,7 +8594,7 @@
   case 601:
 
 /* Line 690 of lalr1.cc  */
-#line 5517 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5517 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8608,7 +8608,7 @@
   case 602:
 
 /* Line 690 of lalr1.cc  */
-#line 5526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5526 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8622,7 +8622,7 @@
   case 603:
 
 /* Line 690 of lalr1.cc  */
-#line 5535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5535 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8633,7 +8633,7 @@
   case 604:
 
 /* Line 690 of lalr1.cc  */
-#line 5541 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5541 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8644,7 +8644,7 @@
   case 605:
 
 /* Line 690 of lalr1.cc  */
-#line 5547 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5547 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8655,7 +8655,7 @@
   case 606:
 
 /* Line 690 of lalr1.cc  */
-#line 5557 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5557 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8664,7 +8664,7 @@
   case 607:
 
 /* Line 690 of lalr1.cc  */
-#line 5574 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5574 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -8673,7 +8673,7 @@
   case 608:
 
 /* Line 690 of lalr1.cc  */
-#line 5581 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5581 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
         }
@@ -8682,7 +8682,7 @@
   case 609:
 
 /* Line 690 of lalr1.cc  */
-#line 5596 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5596 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8691,7 +8691,7 @@
   case 610:
 
 /* Line 690 of lalr1.cc  */
-#line 5623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5623 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8700,7 +8700,7 @@
   case 611:
 
 /* Line 690 of lalr1.cc  */
-#line 5627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5627 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8709,7 +8709,7 @@
   case 612:
 
 /* Line 690 of lalr1.cc  */
-#line 5635 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5635 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
@@ -8718,7 +8718,7 @@
   case 613:
 
 /* Line 690 of lalr1.cc  */
-#line 5643 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5643 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
         }
@@ -8727,7 +8727,7 @@
   case 614:
 
 /* Line 690 of lalr1.cc  */
-#line 5647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5647 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8738,7 +8738,7 @@
   case 615:
 
 /* Line 690 of lalr1.cc  */
-#line 5658 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5658 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8747,7 +8747,7 @@
   case 616:
 
 /* Line 690 of lalr1.cc  */
-#line 5675 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5675 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8758,7 +8758,7 @@
   case 617:
 
 /* Line 690 of lalr1.cc  */
-#line 5681 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5681 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8769,7 +8769,7 @@
   case 618:
 
 /* Line 690 of lalr1.cc  */
-#line 5687 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5687 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8780,7 +8780,7 @@
   case 619:
 
 /* Line 690 of lalr1.cc  */
-#line 5697 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5697 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -8789,7 +8789,7 @@
   case 620:
 
 /* Line 690 of lalr1.cc  */
-#line 5701 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5701 "/home/colea/xquery/new-jsoniq/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)
@@ -8800,7 +8800,7 @@
   case 621:
 
 /* Line 690 of lalr1.cc  */
-#line 5707 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5707 "/home/colea/xquery/new-jsoniq/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)
@@ -8811,7 +8811,7 @@
   case 622:
 
 /* Line 690 of lalr1.cc  */
-#line 5713 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5713 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -8820,7 +8820,7 @@
   case 623:
 
 /* Line 690 of lalr1.cc  */
-#line 5717 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5717 "/home/colea/xquery/new-jsoniq/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)
@@ -8831,7 +8831,7 @@
   case 624:
 
 /* Line 690 of lalr1.cc  */
-#line 5723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5723 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -8840,7 +8840,7 @@
   case 625:
 
 /* Line 690 of lalr1.cc  */
-#line 5727 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5727 "/home/colea/xquery/new-jsoniq/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)
@@ -8851,7 +8851,7 @@
   case 626:
 
 /* Line 690 of lalr1.cc  */
-#line 5733 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5733 "/home/colea/xquery/new-jsoniq/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)
@@ -8862,7 +8862,7 @@
   case 627:
 
 /* Line 690 of lalr1.cc  */
-#line 5739 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5739 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -8874,7 +8874,7 @@
   case 628:
 
 /* Line 690 of lalr1.cc  */
-#line 5746 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5746 "/home/colea/xquery/new-jsoniq/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)
@@ -8885,7 +8885,7 @@
   case 629:
 
 /* Line 690 of lalr1.cc  */
-#line 5756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5756 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8894,7 +8894,7 @@
   case 630:
 
 /* Line 690 of lalr1.cc  */
-#line 5761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5761 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8903,7 +8903,7 @@
   case 631:
 
 /* Line 690 of lalr1.cc  */
-#line 5769 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5769 "/home/colea/xquery/new-jsoniq/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)
@@ -8914,7 +8914,7 @@
   case 632:
 
 /* Line 690 of lalr1.cc  */
-#line 5775 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5775 "/home/colea/xquery/new-jsoniq/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)
@@ -8925,7 +8925,7 @@
   case 633:
 
 /* Line 690 of lalr1.cc  */
-#line 5785 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5785 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8934,7 +8934,7 @@
   case 634:
 
 /* Line 690 of lalr1.cc  */
-#line 5807 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5807 "/home/colea/xquery/new-jsoniq/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) );
@@ -8944,7 +8944,7 @@
   case 635:
 
 /* Line 690 of lalr1.cc  */
-#line 5816 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5816 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -8955,7 +8955,7 @@
   case 636:
 
 /* Line 690 of lalr1.cc  */
-#line 5822 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5822 "/home/colea/xquery/new-jsoniq/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));
@@ -8967,7 +8967,7 @@
   case 637:
 
 /* Line 690 of lalr1.cc  */
-#line 5835 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5835 "/home/colea/xquery/new-jsoniq/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));
     }
@@ -8976,7 +8976,7 @@
   case 638:
 
 /* Line 690 of lalr1.cc  */
-#line 5849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5849 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8985,7 +8985,7 @@
   case 639:
 
 /* Line 690 of lalr1.cc  */
-#line 5856 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5856 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -8996,7 +8996,7 @@
   case 640:
 
 /* Line 690 of lalr1.cc  */
-#line 5862 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5862 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9008,7 +9008,7 @@
   case 641:
 
 /* Line 690 of lalr1.cc  */
-#line 5872 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5872 "/home/colea/xquery/new-jsoniq/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);
@@ -9018,7 +9018,7 @@
   case 642:
 
 /* Line 690 of lalr1.cc  */
-#line 5881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5881 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -9027,7 +9027,7 @@
   case 643:
 
 /* Line 690 of lalr1.cc  */
-#line 5889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5889 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9038,7 +9038,7 @@
   case 644:
 
 /* Line 690 of lalr1.cc  */
-#line 5895 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5895 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9050,7 +9050,7 @@
   case 645:
 
 /* Line 690 of lalr1.cc  */
-#line 5913 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5913 "/home/colea/xquery/new-jsoniq/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);
@@ -9060,7 +9060,7 @@
   case 646:
 
 /* Line 690 of lalr1.cc  */
-#line 5921 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5921 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = NULL;
         }
@@ -9069,7 +9069,7 @@
   case 647:
 
 /* Line 690 of lalr1.cc  */
-#line 5925 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5925 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
@@ -9078,7 +9078,7 @@
   case 648:
 
 /* Line 690 of lalr1.cc  */
-#line 5932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5932 "/home/colea/xquery/new-jsoniq/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)) );
@@ -9088,7 +9088,7 @@
   case 649:
 
 /* Line 690 of lalr1.cc  */
-#line 5937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5937 "/home/colea/xquery/new-jsoniq/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);
@@ -9098,7 +9098,7 @@
   case 650:
 
 /* Line 690 of lalr1.cc  */
-#line 5945 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5945 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9107,7 +9107,7 @@
   case 651:
 
 /* Line 690 of lalr1.cc  */
-#line 5949 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5949 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9116,7 +9116,7 @@
   case 652:
 
 /* Line 690 of lalr1.cc  */
-#line 5956 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5956 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9125,7 +9125,7 @@
   case 653:
 
 /* Line 690 of lalr1.cc  */
-#line 5960 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5960 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9134,7 +9134,7 @@
   case 654:
 
 /* Line 690 of lalr1.cc  */
-#line 5967 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5967 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9143,7 +9143,7 @@
   case 655:
 
 /* Line 690 of lalr1.cc  */
-#line 5971 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5971 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
         }
@@ -9152,7 +9152,7 @@
   case 656:
 
 /* Line 690 of lalr1.cc  */
-#line 5978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5978 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9161,7 +9161,7 @@
   case 657:
 
 /* Line 690 of lalr1.cc  */
-#line 5982 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5982 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9172,7 +9172,7 @@
   case 658:
 
 /* Line 690 of lalr1.cc  */
-#line 5991 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 5991 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9186,7 +9186,7 @@
   case 659:
 
 /* Line 690 of lalr1.cc  */
-#line 6003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6003 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9195,7 +9195,7 @@
   case 660:
 
 /* Line 690 of lalr1.cc  */
-#line 6007 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6007 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9204,7 +9204,7 @@
   case 661:
 
 /* Line 690 of lalr1.cc  */
-#line 6014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6014 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9213,7 +9213,7 @@
   case 662:
 
 /* Line 690 of lalr1.cc  */
-#line 6018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6018 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9222,7 +9222,7 @@
   case 663:
 
 /* Line 690 of lalr1.cc  */
-#line 6026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6026 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -9231,7 +9231,7 @@
   case 664:
 
 /* Line 690 of lalr1.cc  */
-#line 6034 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6034 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9244,7 +9244,7 @@
   case 665:
 
 /* Line 690 of lalr1.cc  */
-#line 6042 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6042 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -9253,7 +9253,7 @@
   case 666:
 
 /* Line 690 of lalr1.cc  */
-#line 6046 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6046 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9262,7 +9262,7 @@
   case 667:
 
 /* Line 690 of lalr1.cc  */
-#line 6053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6053 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9271,7 +9271,7 @@
   case 668:
 
 /* Line 690 of lalr1.cc  */
-#line 6057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6057 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9280,7 +9280,7 @@
   case 669:
 
 /* Line 690 of lalr1.cc  */
-#line 6065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6065 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9293,7 +9293,7 @@
   case 670:
 
 /* Line 690 of lalr1.cc  */
-#line 6076 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6076 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9302,7 +9302,7 @@
   case 671:
 
 /* Line 690 of lalr1.cc  */
-#line 6080 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6080 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9311,7 +9311,7 @@
   case 672:
 
 /* Line 690 of lalr1.cc  */
-#line 6088 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6088 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9324,7 +9324,7 @@
   case 673:
 
 /* Line 690 of lalr1.cc  */
-#line 6100 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6100 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9335,7 +9335,7 @@
   case 674:
 
 /* Line 690 of lalr1.cc  */
-#line 6106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6106 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9346,7 +9346,7 @@
   case 675:
 
 /* Line 690 of lalr1.cc  */
-#line 6115 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6115 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
@@ -9355,7 +9355,7 @@
   case 676:
 
 /* Line 690 of lalr1.cc  */
-#line 6119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6119 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9364,7 +9364,7 @@
   case 677:
 
 /* Line 690 of lalr1.cc  */
-#line 6127 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6127 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9373,7 +9373,7 @@
   case 678:
 
 /* Line 690 of lalr1.cc  */
-#line 6131 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6131 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9382,7 +9382,7 @@
   case 679:
 
 /* Line 690 of lalr1.cc  */
-#line 6135 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6135 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
@@ -9391,7 +9391,7 @@
   case 680:
 
 /* Line 690 of lalr1.cc  */
-#line 6142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
@@ -9400,7 +9400,7 @@
   case 681:
 
 /* Line 690 of lalr1.cc  */
-#line 6146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6146 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
@@ -9409,7 +9409,7 @@
   case 682:
 
 /* Line 690 of lalr1.cc  */
-#line 6153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6153 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
@@ -9418,7 +9418,7 @@
   case 683:
 
 /* Line 690 of lalr1.cc  */
-#line 6157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6157 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
@@ -9427,7 +9427,7 @@
   case 684:
 
 /* Line 690 of lalr1.cc  */
-#line 6165 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6165 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9436,7 +9436,7 @@
   case 685:
 
 /* Line 690 of lalr1.cc  */
-#line 6169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6169 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9445,7 +9445,7 @@
   case 686:
 
 /* Line 690 of lalr1.cc  */
-#line 6173 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6173 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9454,7 +9454,7 @@
   case 687:
 
 /* Line 690 of lalr1.cc  */
-#line 6177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6177 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9463,7 +9463,7 @@
   case 688:
 
 /* Line 690 of lalr1.cc  */
-#line 6181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6181 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9472,7 +9472,7 @@
   case 689:
 
 /* Line 690 of lalr1.cc  */
-#line 6189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6189 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
@@ -9481,7 +9481,7 @@
   case 690:
 
 /* Line 690 of lalr1.cc  */
-#line 6197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6197 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9494,7 +9494,7 @@
   case 691:
 
 /* Line 690 of lalr1.cc  */
-#line 6209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6209 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9507,7 +9507,7 @@
   case 692:
 
 /* Line 690 of lalr1.cc  */
-#line 6221 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6221 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
@@ -9516,7 +9516,7 @@
   case 693:
 
 /* Line 690 of lalr1.cc  */
-#line 6225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6225 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
@@ -9525,7 +9525,7 @@
   case 694:
 
 /* Line 690 of lalr1.cc  */
-#line 6229 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6229 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
@@ -9534,7 +9534,7 @@
   case 695:
 
 /* Line 690 of lalr1.cc  */
-#line 6237 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6237 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -9545,7 +9545,7 @@
   case 696:
 
 /* Line 690 of lalr1.cc  */
-#line 6243 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6243 "/home/colea/xquery/new-jsoniq/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)) );
@@ -9556,7 +9556,7 @@
   case 697:
 
 /* Line 690 of lalr1.cc  */
-#line 6253 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6253 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9565,7 +9565,7 @@
   case 698:
 
 /* Line 690 of lalr1.cc  */
-#line 6257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6257 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9574,7 +9574,7 @@
   case 699:
 
 /* Line 690 of lalr1.cc  */
-#line 6261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6261 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9583,7 +9583,7 @@
   case 700:
 
 /* Line 690 of lalr1.cc  */
-#line 6265 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6265 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9592,7 +9592,7 @@
   case 701:
 
 /* Line 690 of lalr1.cc  */
-#line 6269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6269 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9601,7 +9601,7 @@
   case 702:
 
 /* Line 690 of lalr1.cc  */
-#line 6273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6273 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9610,7 +9610,7 @@
   case 703:
 
 /* Line 690 of lalr1.cc  */
-#line 6277 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6277 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9619,7 +9619,7 @@
   case 704:
 
 /* Line 690 of lalr1.cc  */
-#line 6281 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6281 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9628,7 +9628,7 @@
   case 705:
 
 /* Line 690 of lalr1.cc  */
-#line 6289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6289 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
@@ -9637,7 +9637,7 @@
   case 706:
 
 /* Line 690 of lalr1.cc  */
-#line 6293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6293 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
@@ -9646,7 +9646,7 @@
   case 707:
 
 /* Line 690 of lalr1.cc  */
-#line 6297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6297 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
@@ -9655,7 +9655,7 @@
   case 708:
 
 /* Line 690 of lalr1.cc  */
-#line 6301 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6301 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
@@ -9664,7 +9664,7 @@
   case 709:
 
 /* Line 690 of lalr1.cc  */
-#line 6309 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6309 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9675,7 +9675,7 @@
   case 710:
 
 /* Line 690 of lalr1.cc  */
-#line 6315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6315 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9686,7 +9686,7 @@
   case 711:
 
 /* Line 690 of lalr1.cc  */
-#line 6325 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6325 "/home/colea/xquery/new-jsoniq/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))
@@ -9697,7 +9697,7 @@
   case 712:
 
 /* Line 690 of lalr1.cc  */
-#line 6335 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6335 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
@@ -9706,7 +9706,7 @@
   case 713:
 
 /* Line 690 of lalr1.cc  */
-#line 6339 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6339 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
@@ -9715,7 +9715,7 @@
   case 714:
 
 /* Line 690 of lalr1.cc  */
-#line 6347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6347 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9730,7 +9730,7 @@
   case 715:
 
 /* Line 690 of lalr1.cc  */
-#line 6357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6357 "/home/colea/xquery/new-jsoniq/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) ) {
@@ -9746,7 +9746,7 @@
   case 716:
 
 /* Line 690 of lalr1.cc  */
-#line 6368 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6368 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
@@ -9755,7 +9755,7 @@
   case 717:
 
 /* Line 690 of lalr1.cc  */
-#line 6375 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6375 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9764,7 +9764,7 @@
   case 718:
 
 /* Line 690 of lalr1.cc  */
-#line 6379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6379 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9773,7 +9773,7 @@
   case 719:
 
 /* Line 690 of lalr1.cc  */
-#line 6386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6386 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = NULL;
         }
@@ -9782,7 +9782,7 @@
   case 720:
 
 /* Line 690 of lalr1.cc  */
-#line 6390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6390 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
@@ -9791,7 +9791,7 @@
   case 721:
 
 /* Line 690 of lalr1.cc  */
-#line 6397 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6397 "/home/colea/xquery/new-jsoniq/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)) );
@@ -9801,7 +9801,7 @@
   case 722:
 
 /* Line 690 of lalr1.cc  */
-#line 6402 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6402 "/home/colea/xquery/new-jsoniq/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);
@@ -9811,7 +9811,7 @@
   case 723:
 
 /* Line 690 of lalr1.cc  */
-#line 6411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6411 "/home/colea/xquery/new-jsoniq/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))
@@ -9822,7 +9822,7 @@
   case 724:
 
 /* Line 690 of lalr1.cc  */
-#line 6420 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6420 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = 0;
         }
@@ -9831,7 +9831,7 @@
   case 725:
 
 /* Line 690 of lalr1.cc  */
-#line 6424 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6424 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
@@ -9840,7 +9840,7 @@
   case 726:
 
 /* Line 690 of lalr1.cc  */
-#line 6431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6431 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9849,7 +9849,7 @@
   case 727:
 
 /* Line 690 of lalr1.cc  */
-#line 6435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6435 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -9858,7 +9858,7 @@
   case 728:
 
 /* Line 690 of lalr1.cc  */
-#line 6443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6443 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -9872,7 +9872,7 @@
   case 729:
 
 /* Line 690 of lalr1.cc  */
-#line 6452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6452 "/home/colea/xquery/new-jsoniq/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
@@ -9884,7 +9884,7 @@
   case 730:
 
 /* Line 690 of lalr1.cc  */
-#line 6459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6459 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9895,7 +9895,7 @@
   case 731:
 
 /* Line 690 of lalr1.cc  */
-#line 6469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6469 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
@@ -9904,7 +9904,7 @@
   case 732:
 
 /* Line 690 of lalr1.cc  */
-#line 6473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6473 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
@@ -9913,7 +9913,7 @@
   case 733:
 
 /* Line 690 of lalr1.cc  */
-#line 6480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6480 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -9924,7 +9924,7 @@
   case 734:
 
 /* Line 690 of lalr1.cc  */
-#line 6486 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6486 "/home/colea/xquery/new-jsoniq/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)) );
@@ -9935,7 +9935,7 @@
   case 735:
 
 /* Line 690 of lalr1.cc  */
-#line 6495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6495 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = NULL;
         }
@@ -9944,7 +9944,7 @@
   case 736:
 
 /* Line 690 of lalr1.cc  */
-#line 6499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6499 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
@@ -9953,7 +9953,7 @@
   case 737:
 
 /* Line 690 of lalr1.cc  */
-#line 6506 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6506 "/home/colea/xquery/new-jsoniq/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)) );
@@ -9963,7 +9963,7 @@
   case 738:
 
 /* Line 690 of lalr1.cc  */
-#line 6511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6511 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -9976,7 +9976,7 @@
   case 739:
 
 /* Line 690 of lalr1.cc  */
-#line 6523 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6523 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9989,7 +9989,7 @@
   case 740:
 
 /* Line 690 of lalr1.cc  */
-#line 6531 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6531 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10002,7 +10002,7 @@
   case 741:
 
 /* Line 690 of lalr1.cc  */
-#line 6543 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6543 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -10011,7 +10011,7 @@
   case 742:
 
 /* Line 690 of lalr1.cc  */
-#line 6551 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6551 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
@@ -10020,7 +10020,7 @@
   case 743:
 
 /* Line 690 of lalr1.cc  */
-#line 6555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6555 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
@@ -10029,7 +10029,7 @@
   case 744:
 
 /* Line 690 of lalr1.cc  */
-#line 6563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6563 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
@@ -10038,7 +10038,7 @@
   case 745:
 
 /* Line 690 of lalr1.cc  */
-#line 6567 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6567 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
@@ -10047,7 +10047,7 @@
   case 746:
 
 /* Line 690 of lalr1.cc  */
-#line 6571 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6571 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
@@ -10056,7 +10056,7 @@
   case 747:
 
 /* Line 690 of lalr1.cc  */
-#line 6579 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6579 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
@@ -10065,7 +10065,7 @@
   case 748:
 
 /* Line 690 of lalr1.cc  */
-#line 6587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6587 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -10074,7 +10074,7 @@
   case 749:
 
 /* Line 690 of lalr1.cc  */
-#line 6591 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6591 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10083,7 +10083,7 @@
   case 750:
 
 /* Line 690 of lalr1.cc  */
-#line 6595 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6595 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10092,7 +10092,7 @@
   case 751:
 
 /* Line 690 of lalr1.cc  */
-#line 6599 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6599 "/home/colea/xquery/new-jsoniq/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) );
         }
@@ -10101,7 +10101,7 @@
   case 752:
 
 /* Line 690 of lalr1.cc  */
-#line 6607 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6607 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10114,7 +10114,7 @@
   case 753:
 
 /* Line 690 of lalr1.cc  */
-#line 6615 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6615 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10127,7 +10127,7 @@
   case 754:
 
 /* Line 690 of lalr1.cc  */
-#line 6627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6627 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
@@ -10136,7 +10136,7 @@
   case 755:
 
 /* Line 690 of lalr1.cc  */
-#line 6631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6631 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
@@ -10145,7 +10145,7 @@
   case 756:
 
 /* Line 690 of lalr1.cc  */
-#line 6639 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6639 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
@@ -10154,7 +10154,7 @@
   case 757:
 
 /* Line 690 of lalr1.cc  */
-#line 6653 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6653 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
@@ -10163,7 +10163,7 @@
   case 758:
 
 /* Line 690 of lalr1.cc  */
-#line 6657 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6657 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -10172,7 +10172,7 @@
   case 759:
 
 /* Line 690 of lalr1.cc  */
-#line 6664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6664 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
@@ -10182,7 +10182,7 @@
   case 760:
 
 /* Line 690 of lalr1.cc  */
-#line 6669 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6669 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
@@ -10192,7 +10192,7 @@
   case 761:
 
 /* Line 690 of lalr1.cc  */
-#line 6677 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6677 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
@@ -10202,7 +10202,7 @@
   case 762:
 
 /* Line 690 of lalr1.cc  */
-#line 6682 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6682 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
@@ -10212,7 +10212,7 @@
   case 763:
 
 /* Line 690 of lalr1.cc  */
-#line 6691 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6691 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -10222,7 +10222,7 @@
   case 764:
 
 /* Line 690 of lalr1.cc  */
-#line 6703 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6703 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
@@ -10234,7 +10234,7 @@
   case 765:
 
 /* Line 690 of lalr1.cc  */
-#line 6710 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6710 "/home/colea/xquery/new-jsoniq/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)));
@@ -10245,7 +10245,7 @@
   case 766:
 
 /* Line 690 of lalr1.cc  */
-#line 6716 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6716 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10257,7 +10257,7 @@
   case 767:
 
 /* Line 690 of lalr1.cc  */
-#line 6723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6723 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10270,7 +10270,7 @@
   case 768:
 
 /* Line 690 of lalr1.cc  */
-#line 6734 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6734 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(5) - (3)].expr),
@@ -10281,7 +10281,7 @@
   case 769:
 
 /* Line 690 of lalr1.cc  */
-#line 6740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6740 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10296,7 +10296,7 @@
   case 770:
 
 /* Line 690 of lalr1.cc  */
-#line 6750 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6750 "/home/colea/xquery/new-jsoniq/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));
         }
@@ -10305,7 +10305,7 @@
   case 771:
 
 /* Line 690 of lalr1.cc  */
-#line 6755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6755 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(4) - (2)].expr),
@@ -10316,7 +10316,7 @@
   case 772:
 
 /* Line 690 of lalr1.cc  */
-#line 6761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6761 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(4) - (2)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10331,7 +10331,7 @@
   case 773:
 
 /* Line 690 of lalr1.cc  */
-#line 6771 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6771 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(7) - (2)].expr), (yysemantic_stack_[(7) - (4)].expr), (yysemantic_stack_[(7) - (7)].expr));
         }
@@ -10340,7 +10340,7 @@
   case 774:
 
 /* Line 690 of lalr1.cc  */
-#line 6778 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6778 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
         }
@@ -10349,7 +10349,7 @@
   case 775:
 
 /* Line 690 of lalr1.cc  */
-#line 6782 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6782 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr));
         }
@@ -10358,7 +10358,7 @@
   case 776:
 
 /* Line 690 of lalr1.cc  */
-#line 6789 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6789 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10385,7 +10385,7 @@
   case 777:
 
 /* Line 690 of lalr1.cc  */
-#line 6811 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6811 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(2) - (2)].expr));
@@ -10412,7 +10412,7 @@
   case 778:
 
 /* Line 690 of lalr1.cc  */
-#line 6836 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6836 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10442,7 +10442,7 @@
   case 779:
 
 /* Line 690 of lalr1.cc  */
-#line 6861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6861 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(4) - (2)].expr));
@@ -10472,7 +10472,7 @@
   case 780:
 
 /* Line 690 of lalr1.cc  */
-#line 6889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6889 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10502,7 +10502,7 @@
   case 781:
 
 /* Line 690 of lalr1.cc  */
-#line 6914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6914 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(6) - (4)].expr));
@@ -10532,7 +10532,7 @@
   case 782:
 
 /* Line 690 of lalr1.cc  */
-#line 6942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6942 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10541,7 +10541,7 @@
   case 783:
 
 /* Line 690 of lalr1.cc  */
-#line 6946 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6946 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10550,7 +10550,7 @@
   case 784:
 
 /* Line 690 of lalr1.cc  */
-#line 6950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6950 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10559,7 +10559,7 @@
   case 785:
 
 /* Line 690 of lalr1.cc  */
-#line 6957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6957 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10568,7 +10568,7 @@
   case 786:
 
 /* Line 690 of lalr1.cc  */
-#line 6962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6962 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10577,7 +10577,7 @@
   case 787:
 
 /* Line 690 of lalr1.cc  */
-#line 6969 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6969 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10586,7 +10586,7 @@
   case 788:
 
 /* Line 690 of lalr1.cc  */
-#line 6974 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6974 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10595,7 +10595,7 @@
   case 789:
 
 /* Line 690 of lalr1.cc  */
-#line 6981 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6981 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -10604,7 +10604,7 @@
   case 790:
 
 /* Line 690 of lalr1.cc  */
-#line 6986 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 6986 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -10613,7 +10613,7 @@
   case 793:
 
 /* Line 690 of lalr1.cc  */
-#line 7003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7003 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     {
           auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
           zstring const &tmp = lQName->get_qname();
@@ -10628,1484 +10628,1484 @@
   case 795:
 
 /* Line 690 of lalr1.cc  */
-#line 7016 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7016 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
     break;
 
   case 796:
 
 /* Line 690 of lalr1.cc  */
-#line 7017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7017 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
     break;
 
   case 797:
 
 /* Line 690 of lalr1.cc  */
-#line 7018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7018 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
     break;
 
   case 798:
 
 /* Line 690 of lalr1.cc  */
-#line 7019 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7019 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
     break;
 
   case 799:
 
 /* Line 690 of lalr1.cc  */
-#line 7020 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7020 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
     break;
 
   case 800:
 
 /* Line 690 of lalr1.cc  */
-#line 7022 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7022 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
   case 801:
 
 /* Line 690 of lalr1.cc  */
-#line 7023 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7023 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
   case 802:
 
 /* Line 690 of lalr1.cc  */
-#line 7024 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7024 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
     break;
 
   case 803:
 
 /* Line 690 of lalr1.cc  */
-#line 7025 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7025 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
     break;
 
   case 804:
 
 /* Line 690 of lalr1.cc  */
-#line 7026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7026 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
     break;
 
   case 805:
 
 /* Line 690 of lalr1.cc  */
-#line 7027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7027 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
   case 806:
 
 /* Line 690 of lalr1.cc  */
-#line 7028 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7028 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
   case 807:
 
 /* Line 690 of lalr1.cc  */
-#line 7029 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7029 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
   case 808:
 
 /* Line 690 of lalr1.cc  */
-#line 7030 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7030 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
     break;
 
   case 809:
 
 /* Line 690 of lalr1.cc  */
-#line 7031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7031 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
   case 811:
 
 /* Line 690 of lalr1.cc  */
-#line 7036 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7036 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
   case 812:
 
 /* Line 690 of lalr1.cc  */
-#line 7037 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7037 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
   case 813:
 
 /* Line 690 of lalr1.cc  */
-#line 7038 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7038 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
   case 814:
 
 /* Line 690 of lalr1.cc  */
-#line 7039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7039 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
     break;
 
   case 815:
 
 /* Line 690 of lalr1.cc  */
-#line 7040 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7040 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
     break;
 
   case 816:
 
 /* Line 690 of lalr1.cc  */
-#line 7041 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7041 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
     break;
 
   case 817:
 
 /* Line 690 of lalr1.cc  */
-#line 7042 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7042 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
   case 818:
 
 /* Line 690 of lalr1.cc  */
-#line 7043 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7043 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
   case 819:
 
 /* Line 690 of lalr1.cc  */
-#line 7044 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7044 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
   case 820:
 
 /* Line 690 of lalr1.cc  */
-#line 7045 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7045 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
   case 821:
 
 /* Line 690 of lalr1.cc  */
-#line 7046 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7046 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
   case 822:
 
 /* Line 690 of lalr1.cc  */
-#line 7047 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7047 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
   case 823:
 
 /* Line 690 of lalr1.cc  */
-#line 7048 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7048 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
   case 824:
 
 /* Line 690 of lalr1.cc  */
-#line 7049 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7049 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
   case 825:
 
 /* Line 690 of lalr1.cc  */
-#line 7050 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7050 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
   case 826:
 
 /* Line 690 of lalr1.cc  */
-#line 7051 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7051 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
   case 827:
 
 /* Line 690 of lalr1.cc  */
-#line 7052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7052 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
   case 828:
 
 /* Line 690 of lalr1.cc  */
-#line 7053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7053 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
   case 829:
 
 /* Line 690 of lalr1.cc  */
-#line 7054 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7054 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
   case 830:
 
 /* Line 690 of lalr1.cc  */
-#line 7055 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7055 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
   case 831:
 
 /* Line 690 of lalr1.cc  */
-#line 7056 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7056 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
     break;
 
   case 832:
 
 /* Line 690 of lalr1.cc  */
-#line 7057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7057 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
     break;
 
   case 833:
 
 /* Line 690 of lalr1.cc  */
-#line 7058 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7058 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
     break;
 
   case 834:
 
 /* Line 690 of lalr1.cc  */
-#line 7059 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7059 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
     break;
 
   case 835:
 
 /* Line 690 of lalr1.cc  */
-#line 7060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7060 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
     break;
 
   case 836:
 
 /* Line 690 of lalr1.cc  */
-#line 7061 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7061 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
     break;
 
   case 837:
 
 /* Line 690 of lalr1.cc  */
-#line 7062 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7062 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
     break;
 
   case 838:
 
 /* Line 690 of lalr1.cc  */
-#line 7063 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7063 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
     break;
 
   case 839:
 
 /* Line 690 of lalr1.cc  */
-#line 7064 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7064 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
     break;
 
   case 840:
 
 /* Line 690 of lalr1.cc  */
-#line 7065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7065 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
     break;
 
   case 841:
 
 /* Line 690 of lalr1.cc  */
-#line 7066 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7066 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
     break;
 
   case 842:
 
 /* Line 690 of lalr1.cc  */
-#line 7067 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7067 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
     break;
 
   case 843:
 
 /* Line 690 of lalr1.cc  */
-#line 7068 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7068 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
     break;
 
   case 844:
 
 /* Line 690 of lalr1.cc  */
-#line 7069 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7069 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
     break;
 
   case 845:
 
 /* Line 690 of lalr1.cc  */
-#line 7070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7070 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
     break;
 
   case 846:
 
 /* Line 690 of lalr1.cc  */
-#line 7071 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7071 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
     break;
 
   case 847:
 
 /* Line 690 of lalr1.cc  */
-#line 7072 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7072 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
     break;
 
   case 848:
 
 /* Line 690 of lalr1.cc  */
-#line 7073 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7073 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
     break;
 
   case 849:
 
 /* Line 690 of lalr1.cc  */
-#line 7074 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7074 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
     break;
 
   case 850:
 
 /* Line 690 of lalr1.cc  */
-#line 7075 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7075 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
     break;
 
   case 851:
 
 /* Line 690 of lalr1.cc  */
-#line 7076 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7076 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
     break;
 
   case 852:
 
 /* Line 690 of lalr1.cc  */
-#line 7077 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7077 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
     break;
 
   case 853:
 
 /* Line 690 of lalr1.cc  */
-#line 7078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7078 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
     break;
 
   case 854:
 
 /* Line 690 of lalr1.cc  */
-#line 7079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7079 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
     break;
 
   case 855:
 
 /* Line 690 of lalr1.cc  */
-#line 7080 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7080 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
     break;
 
   case 856:
 
 /* Line 690 of lalr1.cc  */
-#line 7081 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7081 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
     break;
 
   case 857:
 
 /* Line 690 of lalr1.cc  */
-#line 7082 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7082 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
     break;
 
   case 858:
 
 /* Line 690 of lalr1.cc  */
-#line 7083 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7083 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
     break;
 
   case 859:
 
 /* Line 690 of lalr1.cc  */
-#line 7084 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7084 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
     break;
 
   case 860:
 
 /* Line 690 of lalr1.cc  */
-#line 7085 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7085 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
     break;
 
   case 861:
 
 /* Line 690 of lalr1.cc  */
-#line 7086 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7086 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
     break;
 
   case 862:
 
 /* Line 690 of lalr1.cc  */
-#line 7087 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7087 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
     break;
 
   case 863:
 
 /* Line 690 of lalr1.cc  */
-#line 7088 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7088 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
     break;
 
   case 864:
 
 /* Line 690 of lalr1.cc  */
-#line 7089 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7089 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
     break;
 
   case 865:
 
 /* Line 690 of lalr1.cc  */
-#line 7090 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7090 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
     break;
 
   case 866:
 
 /* Line 690 of lalr1.cc  */
-#line 7091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7091 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
     break;
 
   case 867:
 
 /* Line 690 of lalr1.cc  */
-#line 7092 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7092 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
     break;
 
   case 868:
 
 /* Line 690 of lalr1.cc  */
-#line 7093 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7093 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
     break;
 
   case 869:
 
 /* Line 690 of lalr1.cc  */
-#line 7094 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7094 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
     break;
 
   case 870:
 
 /* Line 690 of lalr1.cc  */
-#line 7095 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7095 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
     break;
 
   case 871:
 
 /* Line 690 of lalr1.cc  */
-#line 7096 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7096 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
     break;
 
   case 872:
 
 /* Line 690 of lalr1.cc  */
-#line 7097 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7097 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
     break;
 
   case 873:
 
 /* Line 690 of lalr1.cc  */
-#line 7098 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7098 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
     break;
 
   case 874:
 
 /* Line 690 of lalr1.cc  */
-#line 7099 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7099 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
     break;
 
   case 875:
 
 /* Line 690 of lalr1.cc  */
-#line 7100 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7100 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
     break;
 
   case 876:
 
 /* Line 690 of lalr1.cc  */
-#line 7101 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7101 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
     break;
 
   case 877:
 
 /* Line 690 of lalr1.cc  */
-#line 7102 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7102 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
     break;
 
   case 878:
 
 /* Line 690 of lalr1.cc  */
-#line 7103 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7103 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
     break;
 
   case 879:
 
 /* Line 690 of lalr1.cc  */
-#line 7104 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7104 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
     break;
 
   case 880:
 
 /* Line 690 of lalr1.cc  */
-#line 7105 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7105 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
     break;
 
   case 881:
 
 /* Line 690 of lalr1.cc  */
-#line 7106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7106 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
     break;
 
   case 882:
 
 /* Line 690 of lalr1.cc  */
-#line 7107 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7107 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
     break;
 
   case 883:
 
 /* Line 690 of lalr1.cc  */
-#line 7108 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7108 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
     break;
 
   case 884:
 
 /* Line 690 of lalr1.cc  */
-#line 7109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7109 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
     break;
 
   case 885:
 
 /* Line 690 of lalr1.cc  */
-#line 7110 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7110 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
     break;
 
   case 886:
 
 /* Line 690 of lalr1.cc  */
-#line 7111 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7111 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
     break;
 
   case 887:
 
 /* Line 690 of lalr1.cc  */
-#line 7112 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7112 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
     break;
 
   case 888:
 
 /* Line 690 of lalr1.cc  */
-#line 7113 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7113 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
     break;
 
   case 889:
 
 /* Line 690 of lalr1.cc  */
-#line 7114 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7114 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
     break;
 
   case 890:
 
 /* Line 690 of lalr1.cc  */
-#line 7115 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7115 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
     break;
 
   case 891:
 
 /* Line 690 of lalr1.cc  */
-#line 7116 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7116 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
     break;
 
   case 892:
 
 /* Line 690 of lalr1.cc  */
-#line 7117 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7117 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
     break;
 
   case 893:
 
 /* Line 690 of lalr1.cc  */
-#line 7118 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7118 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
     break;
 
   case 894:
 
 /* Line 690 of lalr1.cc  */
-#line 7119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7119 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
     break;
 
   case 895:
 
 /* Line 690 of lalr1.cc  */
-#line 7120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
     break;
 
   case 896:
 
 /* Line 690 of lalr1.cc  */
-#line 7121 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7121 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
     break;
 
   case 897:
 
 /* Line 690 of lalr1.cc  */
-#line 7122 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7122 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
     break;
 
   case 898:
 
 /* Line 690 of lalr1.cc  */
-#line 7123 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7123 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
     break;
 
   case 899:
 
 /* Line 690 of lalr1.cc  */
-#line 7124 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7124 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
     break;
 
   case 900:
 
 /* Line 690 of lalr1.cc  */
-#line 7125 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7125 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
     break;
 
   case 901:
 
 /* Line 690 of lalr1.cc  */
-#line 7126 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7126 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
     break;
 
   case 902:
 
 /* Line 690 of lalr1.cc  */
-#line 7127 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7127 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
     break;
 
   case 903:
 
 /* Line 690 of lalr1.cc  */
-#line 7128 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7128 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
     break;
 
   case 904:
 
 /* Line 690 of lalr1.cc  */
-#line 7129 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7129 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
     break;
 
   case 905:
 
 /* Line 690 of lalr1.cc  */
-#line 7130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7130 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
     break;
 
   case 906:
 
 /* Line 690 of lalr1.cc  */
-#line 7131 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7131 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
     break;
 
   case 907:
 
 /* Line 690 of lalr1.cc  */
-#line 7132 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7132 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
     break;
 
   case 908:
 
 /* Line 690 of lalr1.cc  */
-#line 7133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7133 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
     break;
 
   case 909:
 
 /* Line 690 of lalr1.cc  */
-#line 7134 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7134 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
     break;
 
   case 910:
 
 /* Line 690 of lalr1.cc  */
-#line 7135 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7135 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
     break;
 
   case 911:
 
 /* Line 690 of lalr1.cc  */
-#line 7136 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7136 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
     break;
 
   case 912:
 
 /* Line 690 of lalr1.cc  */
-#line 7137 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7137 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
     break;
 
   case 913:
 
 /* Line 690 of lalr1.cc  */
-#line 7138 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7138 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
     break;
 
   case 914:
 
 /* Line 690 of lalr1.cc  */
-#line 7139 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7139 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
     break;
 
   case 915:
 
 /* Line 690 of lalr1.cc  */
-#line 7140 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7140 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
     break;
 
   case 916:
 
 /* Line 690 of lalr1.cc  */
-#line 7141 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7141 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
     break;
 
   case 917:
 
 /* Line 690 of lalr1.cc  */
-#line 7142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
     break;
 
   case 918:
 
 /* Line 690 of lalr1.cc  */
-#line 7143 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7143 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
     break;
 
   case 919:
 
 /* Line 690 of lalr1.cc  */
-#line 7144 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7144 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
     break;
 
   case 920:
 
 /* Line 690 of lalr1.cc  */
-#line 7145 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7145 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
     break;
 
   case 921:
 
 /* Line 690 of lalr1.cc  */
-#line 7146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7146 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
     break;
 
   case 922:
 
 /* Line 690 of lalr1.cc  */
-#line 7147 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7147 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
     break;
 
   case 923:
 
 /* Line 690 of lalr1.cc  */
-#line 7148 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7148 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
     break;
 
   case 924:
 
 /* Line 690 of lalr1.cc  */
-#line 7149 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7149 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
     break;
 
   case 925:
 
 /* Line 690 of lalr1.cc  */
-#line 7150 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7150 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
     break;
 
   case 926:
 
 /* Line 690 of lalr1.cc  */
-#line 7151 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7151 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
     break;
 
   case 927:
 
 /* Line 690 of lalr1.cc  */
-#line 7152 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7152 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
     break;
 
   case 928:
 
 /* Line 690 of lalr1.cc  */
-#line 7153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7153 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
     break;
 
   case 929:
 
 /* Line 690 of lalr1.cc  */
-#line 7154 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7154 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
     break;
 
   case 930:
 
 /* Line 690 of lalr1.cc  */
-#line 7155 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7155 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
     break;
 
   case 931:
 
 /* Line 690 of lalr1.cc  */
-#line 7156 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7156 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
     break;
 
   case 932:
 
 /* Line 690 of lalr1.cc  */
-#line 7157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7157 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
     break;
 
   case 933:
 
 /* Line 690 of lalr1.cc  */
-#line 7158 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7158 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
     break;
 
   case 934:
 
 /* Line 690 of lalr1.cc  */
-#line 7159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7159 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
     break;
 
   case 935:
 
 /* Line 690 of lalr1.cc  */
-#line 7160 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7160 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
     break;
 
   case 936:
 
 /* Line 690 of lalr1.cc  */
-#line 7161 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7161 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
     break;
 
   case 937:
 
 /* Line 690 of lalr1.cc  */
-#line 7162 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7162 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
     break;
 
   case 938:
 
 /* Line 690 of lalr1.cc  */
-#line 7164 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7164 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
     break;
 
   case 939:
 
 /* Line 690 of lalr1.cc  */
-#line 7165 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7165 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
     break;
 
   case 940:
 
 /* Line 690 of lalr1.cc  */
-#line 7167 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7167 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
     break;
 
   case 941:
 
 /* Line 690 of lalr1.cc  */
-#line 7168 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7168 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
     break;
 
   case 942:
 
 /* Line 690 of lalr1.cc  */
-#line 7169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7169 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
     break;
 
   case 943:
 
 /* Line 690 of lalr1.cc  */
-#line 7170 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7170 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
     break;
 
   case 944:
 
 /* Line 690 of lalr1.cc  */
-#line 7171 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7171 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
     break;
 
   case 945:
 
 /* Line 690 of lalr1.cc  */
-#line 7173 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7173 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
     break;
 
   case 946:
 
 /* Line 690 of lalr1.cc  */
-#line 7175 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7175 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
     break;
 
   case 947:
 
 /* Line 690 of lalr1.cc  */
-#line 7176 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7176 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
     break;
 
   case 948:
 
 /* Line 690 of lalr1.cc  */
-#line 7177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7177 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
     break;
 
   case 949:
 
 /* Line 690 of lalr1.cc  */
-#line 7178 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7178 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
     break;
 
   case 950:
 
 /* Line 690 of lalr1.cc  */
-#line 7179 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7179 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
     break;
 
   case 951:
 
 /* Line 690 of lalr1.cc  */
-#line 7180 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7180 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
     break;
 
   case 952:
 
 /* Line 690 of lalr1.cc  */
-#line 7181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7181 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
     break;
 
   case 953:
 
 /* Line 690 of lalr1.cc  */
-#line 7182 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7182 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
     break;
 
   case 954:
 
 /* Line 690 of lalr1.cc  */
-#line 7183 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7183 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
     break;
 
   case 955:
 
 /* Line 690 of lalr1.cc  */
-#line 7184 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7184 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
     break;
 
   case 956:
 
 /* Line 690 of lalr1.cc  */
-#line 7185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7185 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
     break;
 
   case 957:
 
 /* Line 690 of lalr1.cc  */
-#line 7186 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7186 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
     break;
 
   case 958:
 
 /* Line 690 of lalr1.cc  */
-#line 7187 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7187 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
     break;
 
   case 959:
 
 /* Line 690 of lalr1.cc  */
-#line 7188 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7188 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
     break;
 
   case 960:
 
 /* Line 690 of lalr1.cc  */
-#line 7189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7189 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
     break;
 
   case 961:
 
 /* Line 690 of lalr1.cc  */
-#line 7190 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7190 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
     break;
 
   case 962:
 
 /* Line 690 of lalr1.cc  */
-#line 7191 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7191 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
     break;
 
   case 963:
 
 /* Line 690 of lalr1.cc  */
-#line 7192 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7192 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
     break;
 
   case 964:
 
 /* Line 690 of lalr1.cc  */
-#line 7193 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7193 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
     break;
 
   case 965:
 
 /* Line 690 of lalr1.cc  */
-#line 7194 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7194 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
     break;
 
   case 966:
 
 /* Line 690 of lalr1.cc  */
-#line 7195 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7195 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
     break;
 
   case 967:
 
 /* Line 690 of lalr1.cc  */
-#line 7196 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7196 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
     break;
 
   case 968:
 
 /* Line 690 of lalr1.cc  */
-#line 7197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7197 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
     break;
 
   case 969:
 
 /* Line 690 of lalr1.cc  */
-#line 7198 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7198 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
     break;
 
   case 970:
 
 /* Line 690 of lalr1.cc  */
-#line 7199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7199 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
     break;
 
   case 971:
 
 /* Line 690 of lalr1.cc  */
-#line 7200 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7200 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
     break;
 
   case 972:
 
 /* Line 690 of lalr1.cc  */
-#line 7201 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7201 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
     break;
 
   case 973:
 
 /* Line 690 of lalr1.cc  */
-#line 7202 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7202 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
     break;
 
   case 974:
 
 /* Line 690 of lalr1.cc  */
-#line 7203 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7203 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
     break;
 
   case 975:
 
 /* Line 690 of lalr1.cc  */
-#line 7204 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7204 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
     break;
 
   case 976:
 
 /* Line 690 of lalr1.cc  */
-#line 7205 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7205 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
     break;
 
   case 977:
 
 /* Line 690 of lalr1.cc  */
-#line 7206 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7206 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
     break;
 
   case 978:
 
 /* Line 690 of lalr1.cc  */
-#line 7207 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7207 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
     break;
 
   case 979:
 
 /* Line 690 of lalr1.cc  */
-#line 7208 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7208 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
     break;
 
   case 980:
 
 /* Line 690 of lalr1.cc  */
-#line 7209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7209 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
     break;
 
   case 981:
 
 /* Line 690 of lalr1.cc  */
-#line 7210 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7210 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
     break;
 
   case 982:
 
 /* Line 690 of lalr1.cc  */
-#line 7211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7211 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
     break;
 
   case 983:
 
 /* Line 690 of lalr1.cc  */
-#line 7212 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7212 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
     break;
 
   case 984:
 
 /* Line 690 of lalr1.cc  */
-#line 7213 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7213 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
     break;
 
   case 985:
 
 /* Line 690 of lalr1.cc  */
-#line 7214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7214 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
     break;
 
   case 986:
 
 /* Line 690 of lalr1.cc  */
-#line 7215 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7215 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
     break;
 
   case 987:
 
 /* Line 690 of lalr1.cc  */
-#line 7216 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7216 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
     break;
 
   case 988:
 
 /* Line 690 of lalr1.cc  */
-#line 7217 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7217 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
     break;
 
   case 989:
 
 /* Line 690 of lalr1.cc  */
-#line 7218 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7218 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
     break;
 
   case 990:
 
 /* Line 690 of lalr1.cc  */
-#line 7219 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7219 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
     break;
 
   case 991:
 
 /* Line 690 of lalr1.cc  */
-#line 7220 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7220 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
     break;
 
   case 992:
 
 /* Line 690 of lalr1.cc  */
-#line 7221 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7221 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
     break;
 
   case 993:
 
 /* Line 690 of lalr1.cc  */
-#line 7222 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7222 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
     break;
 
   case 994:
 
 /* Line 690 of lalr1.cc  */
-#line 7223 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7223 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
     break;
 
   case 995:
 
 /* Line 690 of lalr1.cc  */
-#line 7224 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7224 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
     break;
 
   case 996:
 
 /* Line 690 of lalr1.cc  */
-#line 7225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7225 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
     break;
 
   case 997:
 
 /* Line 690 of lalr1.cc  */
-#line 7226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7226 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
     break;
 
   case 998:
 
 /* Line 690 of lalr1.cc  */
-#line 7227 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7227 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
     break;
 
   case 999:
 
 /* Line 690 of lalr1.cc  */
-#line 7228 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7228 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
     break;
 
   case 1000:
 
 /* Line 690 of lalr1.cc  */
-#line 7229 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7229 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
     break;
 
   case 1001:
 
 /* Line 690 of lalr1.cc  */
-#line 7230 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7230 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
     break;
 
   case 1002:
 
 /* Line 690 of lalr1.cc  */
-#line 7231 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7231 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
     break;
 
   case 1003:
 
 /* Line 690 of lalr1.cc  */
-#line 7232 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7232 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
     break;
 
   case 1004:
 
 /* Line 690 of lalr1.cc  */
-#line 7233 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7233 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
     break;
 
   case 1005:
 
 /* Line 690 of lalr1.cc  */
-#line 7236 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7236 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
     break;
 
   case 1006:
 
 /* Line 690 of lalr1.cc  */
-#line 7245 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7245 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true); }
     break;
 
 
 
 /* Line 690 of lalr1.cc  */
-#line 12109 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 12109 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	default:
           break;
       }
@@ -17981,11 +17981,11 @@
 } // zorba
 
 /* Line 1136 of lalr1.cc  */
-#line 17985 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 17985 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 /* Line 1138 of lalr1.cc  */
-#line 7249 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 7249 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
 
 namespace zorba {

=== modified file 'src/compiler/parser/jsoniq_parser.hpp'
--- src/compiler/parser/jsoniq_parser.hpp	2013-03-27 17:10:46 +0000
+++ src/compiler/parser/jsoniq_parser.hpp	2013-04-07 19:24:25 +0000
@@ -38,7 +38,7 @@
 /* "%code requires" blocks.  */
 
 /* Line 35 of lalr1.cc  */
-#line 35 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 35 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
 
 /*
@@ -85,7 +85,7 @@
 
 
 /* Line 35 of lalr1.cc  */
-#line 89 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+#line 89 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.hpp"
 
 
 #include <string>
@@ -115,7 +115,7 @@
 namespace zorba {
 
 /* Line 35 of lalr1.cc  */
-#line 119 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+#line 119 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.hpp"
 
   /// A Bison parser.
   class jsoniq_parser
@@ -127,7 +127,7 @@
     {
 
 /* Line 35 of lalr1.cc  */
-#line 148 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+#line 148 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
 
     zorba::parsenode *node;
     zorba::exprnode *expr;
@@ -151,7 +151,7 @@
 
 
 /* Line 35 of lalr1.cc  */
-#line 155 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+#line 155 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.hpp"
     };
 #else
     typedef YYSTYPE semantic_type;
@@ -679,7 +679,7 @@
 } // zorba
 
 /* Line 35 of lalr1.cc  */
-#line 683 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+#line 683 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.hpp"
 
 
 

=== modified file 'src/compiler/parser/jsoniq_scanner.cpp'
--- src/compiler/parser/jsoniq_scanner.cpp	2013-03-27 17:10:46 +0000
+++ src/compiler/parser/jsoniq_scanner.cpp	2013-04-07 19:24:25 +0000
@@ -79,6 +79,7 @@
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -109,8 +110,6 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 /* %endif */
@@ -119,8 +118,8 @@
 /* begin standard C++ headers. */
 #include <iostream> 
 #include <errno.h>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 /* end standard C++ headers. */
 /* %endif */
@@ -192,15 +191,7 @@
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -3305,16 +3296,16 @@
       752,  753,  754,  755,  756,  757,  759,  760,  761,  762,
       763,  764,  765,  766,  767,  768,  769,  770,  771,  772,
       773,  774,  775,  777,  778,  779,  786,  797,  802,  814,
-      820,  822,  824,  826,  828,  830,  832,  834,  838,  847,
-      852,  857,  862,  867,  872,  877,  882,  887,  890,  904,
-      910,  916,  935,  936,  938,  950,  951,  952,  953,  954,
+      820,  822,  824,  826,  828,  830,  832,  834,  839,  848,
+      853,  858,  863,  868,  873,  878,  883,  888,  891,  905,
+      911,  917,  936,  937,  939,  951,  952,  953,  954,  955,
 
-      965,  979,  980,  981,  982,  983,  984,  985,  986, 1004,
-     1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014,
-     1026, 1027, 1039, 1040, 1052, 1053, 1054, 1055, 1068, 1069,
-     1070, 1082, 1083, 1084, 1095, 1109, 1126, 1127, 1128, 1129,
-     1130, 1131, 1132, 1133, 1145, 1146, 1147, 1148, 1149, 1150,
-     1151, 1152, 1161
+      966,  980,  981,  982,  983,  984,  985,  986,  987, 1005,
+     1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015,
+     1027, 1028, 1040, 1041, 1053, 1054, 1055, 1056, 1069, 1070,
+     1071, 1083, 1084, 1085, 1096, 1110, 1127, 1128, 1129, 1130,
+     1131, 1132, 1133, 1134, 1146, 1147, 1148, 1149, 1150, 1151,
+     1152, 1153, 1162
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -3324,7 +3315,7 @@
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 1 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 /*
  * Copyright 2006-2008 The FLWOR Foundation.
  *
@@ -3340,7 +3331,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#line 17 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 17 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 
 
 #if defined (WIN32)
@@ -3623,18 +3614,18 @@
 
 
 
-#line 403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 403 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
   typedef zorba::jsoniq_parser::token token;
 /*______________________________________________________________________
 |
 |  Override Flex's starting state here.
 |______________________________________________________________________*/
-#line 412 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 412 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 #define YY_USER_INIT      \
 {                         \
   BEGIN MODE_SHEBANG;     \
 }
-#line 3638 "jsoniq_scanner.yy.cpp"
+#line 3629 "jsoniq_scanner.yy.cpp"
 
 #define INITIAL 0
 #define MODE_SHEBANG 1
@@ -3711,12 +3702,7 @@
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -3816,7 +3802,7 @@
 	register int yy_act;
     
 /* %% [7.0] user's declarations go here */
-#line 419 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 419 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 
 
 
@@ -3827,7 +3813,7 @@
    |  Accepts the "#!/path/interpreter" unix script shebang string
    |______________________________________________________________________*/
 
-#line 3831 "jsoniq_scanner.yy.cpp"
+#line 3817 "jsoniq_scanner.yy.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -3939,13 +3925,13 @@
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 430 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 430 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SHEBANG; }
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 431 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { BEGIN INITIAL; yyless(0); }
 	YY_BREAK
 
@@ -3959,112 +3945,112 @@
 
 case 3:
 YY_RULE_SETUP
-#line 445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 445 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::LPAR; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 446 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 446 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SEMI; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 447 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 447 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COMMA; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 448 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 448 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MINUS; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 449 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 449 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PLUS; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 450 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 450 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SLASH; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 451 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 451 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SLASH_SLASH; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 452 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::BANG; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::AT_SIGN; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 454 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 454 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::RPAR; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 455 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 455 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::STAR; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 456 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 456 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOT_DOT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 457 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 457 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 458 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 458 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::HOOK; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 459 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOLLAR; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 460 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 460 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOLLAR_DOLLAR; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 461 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 461 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::HASH; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 462 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 462 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COLON; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 463 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 463 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOUBLE_COLON; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 464 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 464 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PERCENTAGE; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 465 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 465 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONCAT; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 467 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 467 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {
   std::string lDocComment = theDriver->theDocComment.str();
   yylval->sval = getDriver()->symtab.put_commentcontent(lDocComment.c_str(), lDocComment.length());
@@ -4074,7 +4060,7 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 474 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 474 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {
   std::string lDocComment = theDriver->theDocComment.str();
   yylval->sval = getDriver()->symtab.put_commentcontent(lDocComment.c_str(), lDocComment.length());
@@ -4085,434 +4071,434 @@
 /* Tokens with state transitions */
 case 26:
 YY_RULE_SETUP
-#line 482 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 482 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {  PUSH_STATE(MODE_ELEM_COMP_CONSTR); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 483 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 483 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { PUSH_STATE(MODE_ATTR_COMP_CONSTR); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 484 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { PUSH_STATE(MODE_PI_COMP_CONSTR); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 485 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 485 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { PUSH_STATE(MODE_NS_COMP_CONSTR); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 488 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 488 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::IF; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 489 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 489 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::RETURNING; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 491 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 491 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::EXIT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 492 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 492 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::WITH; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 493 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 493 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::BREAK; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 494 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 494 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::LOOP; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 495 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONTINUE; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 496 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 496 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::WHILE; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 497 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 497 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SET; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 498 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 498 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::VALIDATE; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 499 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::TYPE; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 500 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 500 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SWITCH; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 501 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 501 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::TYPESWITCH; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 502 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 502 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOCUMENT; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 503 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 503 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::TEXT; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 504 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 504 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COMMENT; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 505 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 505 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FUNCTION; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 506 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 506 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SIMPLE; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 507 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::UPDATING; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 508 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 508 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SEQUENTIAL; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 509 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 509 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ORDERED;}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 510 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 510 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::UNORDERED; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 511 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SCHEMA_ELEMENT; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 512 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 512 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SCHEMA_ATTRIBUTE; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 513 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 513 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NODE; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 514 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 514 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DOCUMENT_NODE; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 515 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 515 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NS_NODE; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 516 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 516 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONSTRUCTION; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 517 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 517 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DEFAULT; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 518 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 518 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ORDER; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 519 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 519 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COLLATION; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 520 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 520 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::BASE_URI; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 521 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 521 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::IMPORT; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 522 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 522 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SCHEMA; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 523 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 523 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COPY_NAMESPACES; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 524 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 524 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FOR; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 525 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 525 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::LET; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 526 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ALLOWING; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 527 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 527 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SLIDING; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 528 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 528 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::TUMBLING; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 529 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 529 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PREVIOUS; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 530 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 530 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NEXT; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 531 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 531 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ONLY; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 532 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 532 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::WHEN; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 533 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 533 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COUNT; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 534 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 534 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::USING; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 535 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SOME; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 536 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 536 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::EVERY; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 537 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 537 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONTEXT; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 538 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 538 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::VARIABLE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 539 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 539 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::BOUNDARY_SPACE; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 540 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 540 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ORDERING; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 541 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 541 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::XQUERY; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 542 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 542 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::JSONIQ; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 543 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 543 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::VERSION; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 544 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 544 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::OPTION; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 545 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 545 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::AT; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 546 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 546 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::REVALIDATION; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 547 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 547 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::AS; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 548 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 548 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::TRY; }
 	YY_BREAK
 /* Axes */
 case 90:
 YY_RULE_SETUP
-#line 551 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 551 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ANCESTOR_OR_SELF; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 552 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 552 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ANCESTOR; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 553 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 553 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CHILD; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 554 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 554 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DESCENDANT_OR_SELF; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 555 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DESCENDANT; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 556 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 556 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FOLLOWING_SIBLING; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 557 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 557 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FOLLOWING; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 558 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 558 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PARENT; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 559 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PRECEDING_SIBLING; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 560 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 560 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PRECEDING; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 561 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 561 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SELF;}
 	YY_BREAK
 /* Decimal format */
 case 101:
 YY_RULE_SETUP
-#line 564 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 564 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DECIMAL_FORMAT; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 565 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 565 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DECIMAL_SEPARATOR; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 566 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 566 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::GROUPING_SEPARATOR; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 567 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 567 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::INFINITY_VALUE; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 568 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 568 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MINUS_SIGN; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 569 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 569 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NaN; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 570 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 570 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PERCENT; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 571 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 571 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PER_MILLE; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 572 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ZERO_DIGIT; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 573 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 573 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DIGIT; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 574 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 574 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::PATTERN_SEPARATOR; }
 	YY_BREAK
 /*______________________________________________________________________
@@ -4521,117 +4507,117 @@
    |______________________________________________________________________*/
 case 112:
 YY_RULE_SETUP
-#line 581 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 581 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::COLLECTION; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 582 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 582 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONSTOPT; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 583 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 583 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::APPEND_ONLY; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 584 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 584 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::QUEUE; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 585 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 585 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MUTABLE; }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 586 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 586 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::READ_ONLY; }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 588 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::INDEX; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 589 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 589 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::UNIQUE; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 590 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 590 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NON; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 591 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 591 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MANUALLY; }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 592 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 592 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::AUTOMATICALLY; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 593 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 593 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MAINTAINED; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 594 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 594 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::RANGE; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 595 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 595 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::EQUALITY; }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 596 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 596 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ON; }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 597 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 597 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::GENERAL; }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 599 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 599 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::INTEGRITY; }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 600 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 600 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONSTRAINT; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 601 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 601 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CHECK; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 602 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 602 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::KEY; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 603 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 603 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FOREACH; }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 604 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FOREIGN; }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 605 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 605 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::KEYS; }
 	YY_BREAK
 /*______________________________________________________________________
@@ -4642,22 +4628,22 @@
      of the "{[ ]}" grammar construct */
 case 135:
 YY_RULE_SETUP
-#line 615 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 615 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { PUSH_STATE(INITIAL); return token::LBRACK; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 616 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 616 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { POP_STATE(); return token::RBRACK; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 618 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 618 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { PUSH_STATE(INITIAL_ACCUMULATOR); return token::L_ACCUMULATOR_OBJ_UNION; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 619 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 619 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {
         // This if() disambiguates between the "{[ ]}" grammar construct and the
         // plain "[ ]" predicate
@@ -4676,47 +4662,47 @@
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 635 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 635 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::L_SIMPLE_OBJ_UNION; }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 636 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 636 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::R_SIMPLE_OBJ_UNION; }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 637 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 637 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::JSON; }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 638 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 638 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::APPEND; }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 639 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 639 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::POSITION; }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 640 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 640 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::JSON_ITEM; }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 641 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 641 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::STRUCTURED_ITEM; }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 642 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {  return token::ARRAY; }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 643 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 643 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 {  return token::OBJECT; }
 	YY_BREAK
 /*______________________________________________________________________
@@ -4725,402 +4711,402 @@
      |______________________________________________________________________*/
 case 148:
 YY_RULE_SETUP
-#line 651 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 651 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CONTAINS; }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 652 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 652 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FTAND; }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 653 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 653 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FTOR; }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 654 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 654 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FTNOT; }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 655 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 655 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::NOT; }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 656 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 656 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::_IN; }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 657 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 657 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ALL; }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 658 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 658 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::WORDS; }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 659 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 659 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::ANY; }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 660 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 660 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::WORD; }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 661 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 661 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::END; }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 662 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 662 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::LEAST; }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 663 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 663 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::MOST; }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 664 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::START; }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 665 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 665 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::CASE; }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 666 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 666 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::INSENSITIVE; }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 667 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 667 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::SENSITIVE; }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 668 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 668 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::FT_OPTION; }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 669 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 669 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_scanner.l"
 { return token::DIACRITICS; }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 670 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+#line 670 "/home/colea/xquery/new-jsoniq/src/compiler/parser/json